From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 18 Jun 2012 08:57:51 +0000 (+0200)
Subject: Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v3.6-rc1~167^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4983955c049d1debe5f6bee3aeb54ff5942fcd39;p=thirdparty%2Flinux.git

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

Pull ftrace robustization fixes from Steve Rostedt.

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

4983955c049d1debe5f6bee3aeb54ff5942fcd39