]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2008 02:53:02 +0000 (18:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2008 02:53:02 +0000 (18:53 -0800)
commited7f0cf428a957afa96677f1162014ffab4b1aef
treef127ddaf0b582098caf7f9e3ed18ed535324eae4
parent343e5f1b554d02db5afd03498a4fccbf0901caef
parent03aa84ba3b77946cbc5c36730a6f0fd6895e27d9
Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: make NUMA on 32-bit depend on EXPERIMENTAL again
  x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set
arch/x86/Kconfig