Merge branch 'perf/urgent' into perf/core
Ingo Molnar [Tue, 20 Oct 2009 05:51:41 +0000 (07:51 +0200)]
Merge reason: Queue up dependent patch.

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

1  2 
kernel/perf_event.c
tools/perf/builtin-top.c

Simple merge
Simple merge