Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <[email protected]>
Thu, 24 May 2012 07:06:24 +0000 (09:06 +0200)
committerIngo Molnar <[email protected]>
Thu, 24 May 2012 07:06:24 +0000 (09:06 +0200)
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 <[email protected]>

Trivial merge