tree cf48e5c871250c2bfd1d0590acd2f0569e95b950
parent 7e0dd574cd6b1bcc818ed4251e5ceda7d8bee08f
parent 1c7d66732458dc187008e3f5b2f71e019e320fc2
author Ingo Molnar <mingo@kernel.org> 1354978475 +0100
committer Ingo Molnar <mingo@kernel.org> 1354978475 +0100

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

Pull ftrace updates from Steve Rostedt.

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