projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f936991 6a31e1f)
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)
commit9ba0541453b3a57797701b9fbc0fd8d0be173050
tree29cc15e3d9b05d78f8adb8516baf6c1a3d7626a9tree | snapshot
parentf9369910a6225b8d4892c3f20ae740a711cd5acecommit | diff
parent6a31e1f135d1abfb5137697f889c8cd5d72eb522commit | diff
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>
Domain: System / Uncategorized;