Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
Ingo Molnar [Fri, 11 Nov 2011 07:19:37 +0000 (08:19 +0100)]
1  2 
kernel/jump_label.c
kernel/lockdep.c
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_irqsoff.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge