Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 31 Jul 2007 22:51:37 +0000 (15:51 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 31 Jul 2007 22:51:37 +0000 (15:51 -0700)
commit8ddf83fed6c283dd941ca76ae715eb268ee8c04e
tree309628fccc4ec213afd8ebd28181703050bb046a
parent0d6caa1795090bd22ede96b84daa4600b63eee37
parentff659d13ed91dd0b237064aba91a5259f827aeb3
Merge branch 'for-linus' of git://git./linux/kernel/git/hpa/linux-2.6-x86setup

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  [x86 setup] EDD: Fix the computation of the MBR sector buffer
  [x86 setup] Newline after setup signature failure message
  x86 boot code comments typos