Merge branch 'perf/core' into perf/probes
authorIngo Molnar <mingo@elte.hu>
Tue, 17 Nov 2009 09:16:43 +0000 (10:16 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Nov 2009 09:17:47 +0000 (10:17 +0100)
Resolved merge conflict in tools/perf/Makefile

Merge reason: we want to queue up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge