]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68b31bb 81709ed)
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Thu, 24 May 2012 07:06:24 +0000 (09:06 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 24 May 2012 07:06:24 +0000 (09:06 +0200)
commitd54be06bf15957675b6bbb226693d595ccb04e29
tree29cc15e3d9b05d78f8adb8516baf6c1a3d7626a9tree | snapshot
parent68b31bbbe088727257c8fa5b1ca11fdcac12e0fbcommit | diff
parent81709edce2f9d2fa4ea6629fe69ac44baa992aaacommit | diff
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>
Linux Kernel Source Tree.