tree de0233d45fec273920bce0bc8640465cbf439600
parent 47fbc518a4b5c9a949f7cab8b14a00d3549bf138
parent a5fb833172eca69136e9ee1ada778e404086ab8a
author Ingo Molnar <mingo@kernel.org> 1341565937 +0200
committer Ingo Molnar <mingo@kernel.org> 1341565937 +0200

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

Pull tracing updates from Steve Rostedt.

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