]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
Pull tracing fixes from Steven Rostedt.

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

Simple merge