tree 29cc15e3d9b05d78f8adb8516baf6c1a3d7626a9
parent f9369910a6225b8d4892c3f20ae740a711cd5ace
parent 6a31e1f135d1abfb5137697f889c8cd5d72eb522
author Ingo Molnar <mingo@kernel.org> 1337843184 +0200
committer Ingo Molnar <mingo@kernel.org> 1337843184 +0200

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/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>