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)
commit08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1
treeb8a4f41686c3478f3b938155c866730164b8906c
parentfd6da696f38b00ffeae1185d6f0ec5d4ab3b472d
parent9366c1ba13fbc41bdb57702e75ca4382f209c82f
Merge branch 'tip/perf/urgent-2' of git://git./linux/kernel/git/rostedt/linux-trace into perf/urgent

Pull ftrace fixes from Steve Rostedt.

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