Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 22:33:59 +0000 (15:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 22:33:59 +0000 (15:33 -0700)
commit919d25a710bd6ded210426e911c9f9ec535d8d9c
tree7c49ecdc8cba950a582951ae8ee450153c0840f2
parente6625fa48e6580a74b7e700efd7e6463e282810b
parent3628c3f5c818cfc6e588d1ccb31f19aa12345c02
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86. reboot: Make Dell Latitude E6320 use reboot=pci
  x86, doc only: Correct real-mode kernel header offset for init_size
  x86: Disable AMD_NUMA for 32bit for now