tree 585f685aacda161cb00bb0c8599e4f60b3c262c6
parent bcada3d4b8c96b8792c2306f363992ca5ab9da42
parent 87abb3b15c62033409f5bf2ffb5620c94f91cf2c
author Ingo Molnar <mingo@kernel.org> 1345541799 +0200
committer Ingo Molnar <mingo@kernel.org> 1345541809 +0200

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

Pull ftrace fixlets from Steve Rostedt.

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