Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Tue, 13 Nov 2012 18:21:32 +0000 (19:21 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 13 Nov 2012 18:21:32 +0000 (19:21 +0100)
commit84e53ff77cb1e005f49966cd6789109d84acc9e2
tree4d1426dc45c8af73e78279bd737eb1dd63909f11
parentccf59d8da119ab03dcbdf95fb5e5adcef6ba51f2
parent7bcfaf54f591a0775254c4ea679faf615152ee3a
Merge branch 'tip/perf/core-2' of git://git./linux/kernel/git/rostedt/linux-trace into perf/core

Pull tracing updates from Steven Rostedt.

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