diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 09:18:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 09:18:56 -0700 |
commit | 051a82fc0c450f6ca649acf684586477aa6d5c6a (patch) | |
tree | 51ae5217559da84a1ea38e6db756a2c421fa3631 /drivers/infiniband/hw/ipath/ipath_kernel.h | |
parent | 6c47d773e7d8f784996d9027f035379baa19ded7 (diff) | |
parent | 08f503b0c089968b2542659a89dfd50c5c59bb0b (diff) |
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"
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_kernel.h')
0 files changed, 0 insertions, 0 deletions