Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@kernel.org>
Mon, 18 Jun 2012 08:57:51 +0000 (10:57 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 18 Jun 2012 08:57:51 +0000 (10:57 +0200)
commit4983955c049d1debe5f6bee3aeb54ff5942fcd39
treeaa3c9b03d92c31f8c9414d9b1f1534b47c83a4c0
parente227051b13956b8f71c0abecc41ad351e64671c8
parent7374e82771c6d5a9af2080be46f64a5826c7efb1
Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-trace into perf/core

Pull ftrace robustization fixes from Steve Rostedt.

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