From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 11 Mar 2008 16:18:56 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux... 
X-Git-Tag: v2.6.25-rc6~42
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=051a82fc0c450f6ca649acf684586477aa6d5c6a

Merge branch 'for-linus' of git://git./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"
---

051a82fc0c450f6ca649acf684586477aa6d5c6a