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)
commita0e0fac633bed47c15cab744663d8c67f8f3421d
tree585f685aacda161cb00bb0c8599e4f60b3c262c6
parentbcada3d4b8c96b8792c2306f363992ca5ab9da42
parent87abb3b15c62033409f5bf2ffb5620c94f91cf2c
Merge branch 'tip/perf/core-2' of git://git./linux/kernel/git/rostedt/linux-trace into perf/core

Pull ftrace fixlets from Steve Rostedt.

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