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)
commit3108864e2d70891d30d60af6af256a1b517d7078
treef127ddaf0b582098caf7f9e3ed18ed535324eae4
parent4f7dbc7ff4ec19b40ec083f7c54a87d3ece0089d
parent604d20554883cf03f888440d58ea7c6d36899839
Merge branch 'x86/numa' of git://git./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