Merge branch 'perf/scripting' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 3 Dec 2009 19:10:35 +0000 (20:10 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 3 Dec 2009 19:10:42 +0000 (20:10 +0100)
Merge reason: it's ready for v2.6.33.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
tools/perf/Makefile

Simple merge