From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 24 May 2012 07:06:24 +0000 (+0200)
Subject: Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... 
X-Git-Tag: v3.5-rc1~37^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ba0541453b3a57797701b9fbc0fd8d0be173050;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Pull an ftrace ring-buffer fix from Steve Rostedt:

 * fix kernel crash when changing the size of the ring-buffer on
   boxes where possible_cpus != online_cpus.

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

9ba0541453b3a57797701b9fbc0fd8d0be173050