Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
Ingo Molnar [Thu, 11 Mar 2010 12:39:33 +0000 (13:39 +0100)]
1  2 
kernel/trace/ftrace.c
kernel/trace/trace.c

Simple merge
Simple merge