Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:42:17 +0000 (15:42 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:42:47 +0000 (15:42 +0100)
Pull ftrace fixes from Steve Rostedt.

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

Trivial merge