Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:36:38 +0000 (12:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:36:38 +0000 (12:36 -0700)
commitb1ae8d3a00530c035ef97fa4d97f4bee9be75c43
tree6d98f8048b68643803c6a70fba503c18126bd8d1
parent55017923f699471f68c1469d5f3ff141dd416ab4
parentffe6e1da86d21d7855495b5a772c93f050258f6e
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, geode: add a VSA2 ID for General Software
  x86: use BOOTMEM_EXCLUSIVE on 32-bit
  x86, 32-bit: fix boot failure on TSC-less processors
  x86: fix NULL pointer deref in __switch_to
  x86: set PAE PHYSICAL_MASK_SHIFT to 44 bits.