Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Tue, 21 Aug 2012 09:36:39 +0000 (11:36 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 21 Aug 2012 09:36:49 +0000 (11:36 +0200)
Pull ftrace fixlets from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/trace/trace.c

Simple merge