Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@kernel.org>
Fri, 6 Jul 2012 09:12:17 +0000 (11:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 6 Jul 2012 09:12:17 +0000 (11:12 +0200)
commit35c2f48c66d9c1b8d794c3936c3be22aa7c89adb
treede0233d45fec273920bce0bc8640465cbf439600
parent47fbc518a4b5c9a949f7cab8b14a00d3549bf138
parenta5fb833172eca69136e9ee1ada778e404086ab8a
Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-trace into perf/core

Pull tracing updates from Steve Rostedt.

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