Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 20 Oct 2009 05:51:41 +0000 (07:51 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 20 Oct 2009 05:51:44 +0000 (07:51 +0200)
commitc258449bc9d286e2ee6546c9cdf911e96cbc126a
tree51d389391bf6bef4be756652e401823f8171656e
parent79b9ad361be8c6f3eeea97dd3883e8bcfa989333
parent2e600d01c131ee189f55ca1879cd364b9e056df8
Merge branch 'perf/urgent' into perf/core

Merge reason: Queue up dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/perf_event.c
tools/perf/builtin-top.c