Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@kernel.org>
Wed, 18 Jul 2012 09:18:00 +0000 (11:18 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 18 Jul 2012 09:18:00 +0000 (11:18 +0200)
commit6e0f17be0361444862637e8986c8c1a3b3f8dcf8
tree12322ecf05872d9c30c8cf3d77d4ed6961e87cd7
parenta2fe194723f6e4990d01d8c208c7b138fd410522
parent93574fcc5b50cc7b8834698acb2ce947e5b6a5dc
Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-trace into perf/core

Pull tracing fix from Steve Rostedt.

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