Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
Ingo Molnar [Fri, 23 Jul 2010 07:10:29 +0000 (09:10 +0200)]
1  2 
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_output.c

Simple merge
Simple merge
Simple merge