]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 11 Mar 2008 16:18:56 +0000 (09:18 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 11 Mar 2008 16:18:56 +0000 (09:18 -0700)
commit051a82fc0c450f6ca649acf684586477aa6d5c6a
tree51ae5217559da84a1ea38e6db756a2c421fa3631
parent6c47d773e7d8f784996d9027f035379baa19ded7
parent08f503b0c089968b2542659a89dfd50c5c59bb0b
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel:
  keep rd->online and cpu_online_map in sync
  Revert "cpu hotplug: adjust root-domain->online span in response to hotplug event"