Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 31 Jan 2012 12:02:35 +0000 (13:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 31 Jan 2012 12:02:37 +0000 (13:02 +0100)
We cherry-picked 3 commits into perf/urgent, merge them back to allow
conflict-free work on those files.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
include/linux/perf_event.h
kernel/events/core.c
tools/perf/builtin-top.c

Simple merge
Simple merge
Simple merge