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)
commitbb1693f89ae7f0b30c90d9b26a4f827faed1144a
treee02fc59d76d79493bffa190e492775baa134bff6
parentefb3040d481a1594592b1defb4526c406c7a4751
parent45179fec946dd554f74e950d2278dabd5ad23fd3
Merge branch 'perf/urgent' into perf/core

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>
include/linux/perf_event.h
kernel/events/core.c
tools/perf/builtin-top.c