Merge branch 'linus' into perf/core
Ingo Molnar [Thu, 15 Oct 2009 06:44:42 +0000 (08:44 +0200)]
Merge reason: pick up tools/perf/ changes from upstream.

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

1  2 
tools/perf/Makefile
tools/perf/builtin-sched.c
tools/perf/util/trace-event-parse.c

Simple merge
Simple merge
Simple merge