Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
Ingo Molnar [Tue, 5 Jul 2011 09:55:43 +0000 (11:55 +0200)]
1  2 
kernel/trace/ftrace.c
kernel/trace/trace_kprobe.c

Simple merge
Simple merge