Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Wed, 27 Apr 2011 08:38:30 +0000 (10:38 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 27 Apr 2011 08:40:21 +0000 (10:40 +0200)
commit32673822e440eb92eb334631eb0a199d0c532d13
treec1e55c1793fa17937d9b8e0a9a2946583f1948d5
parentfa7b69475a6c192853949ba496dd9c37b497b548
parent5373db886b791b2bc7811e2c115377916c409a5d
Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core

Conflicts:
include/linux/perf_event.h

Merge reason: pick up the latest jump-label enhancements, they are cooked ready.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/asm-generic/vmlinux.lds.h
include/linux/perf_event.h
kernel/perf_event.c
kernel/trace/trace.c