tree dcabf0074a34ce0ebe5c182b824ff9eb830010ae
parent a91f408e4435d4f572392295ee47756b6f5011c7
parent 8781915ad2716adcd8cd5cc52cee791fc8b00fdf
author Ingo Molnar <mingo@kernel.org> 1348658493 +0200
committer Ingo Molnar <mingo@kernel.org> 1348658493 +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>