Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
Ingo Molnar [Fri, 26 Feb 2010 08:20:17 +0000 (09:20 +0100)]
1  2 
kernel/trace/Kconfig
kernel/trace/trace_kprobe.c

Simple merge
Simple merge