Merge branch 'linus' into perf/core
commitb226f744d40b052ac126c4cb16c76f66e5185128
authorIngo Molnar <mingo@elte.hu>
Thu, 15 Oct 2009 06:44:42 +0000 (15 08:44 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 15 Oct 2009 06:44:44 +0000 (15 08:44 +0200)
treee86f5c059dde241472689cbe2d55429cd15b2d56
parentd5b889f2ecec7849e851ddd31c34bdfb3482b5de
parenta3ccf63ee643ef243cbf8918da8b3f9238f10029
Merge branch 'linus' into perf/core

Merge reason: pick up tools/perf/ changes from upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/Makefile
tools/perf/builtin-sched.c
tools/perf/util/trace-event-parse.c