Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Thu, 14 Mar 2013 07:12:20 +0000 (08:12 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 14 Mar 2013 07:12:20 +0000 (08:12 +0100)
commit0b34083f46c3784c6535dc9742dc13653ec1908d
treefec964226f201b3aed008589b8eae7b0883d5bfb
parentaea8b5d1e5c5482e7cdda849dc16d728f7080289
parent740466bc89ad8bd5afcc8de220f715f62b21e365
Merge branch 'tip/perf/urgent-2' of git://git./linux/kernel/git/rostedt/linux-trace into perf/urgent

Pull tracing fixes from Steven Rostedt.

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