From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 8 Dec 2012 14:42:17 +0000 (+0100)
Subject: Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.8-rc1~170^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1;p=people%2Fms%2Flinux.git

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

Pull ftrace fixes from Steve Rostedt.

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

08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1