Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 01:58:56 +0000 (18:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 01:58:56 +0000 (18:58 -0700)
commit041924ec2f40efa6a3163144a5481a000804199d
tree8d6d8cb6022dfff00fefb85341e19343c4396f7c
parentf36b7a2c170ff1dbbb38d235817e04020b196950
parentefac41894df57d32b483ac622d03541b5b2692c0
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: fix NODES_SHIFT Kconfig range
arch/x86/Kconfig