Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
Ingo Molnar [Fri, 6 Jul 2012 09:12:17 +0000 (11:12 +0200)]
Pull tracing updates from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1  2 
kernel/trace/trace.c

Simple merge