Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 18 Aug 2007 16:31:05 +0000 (09:31 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 18 Aug 2007 16:31:05 +0000 (09:31 -0700)
commitb2d597cb6d64d5e30236273249e3790434387743
tree2ab7b15d2223212d7f71b9ccd50b69621bad5dd8
parentedd5f25f7475013b44f7942bb3b25022792a9c9d
parent9a5f35d4ede43fee791a486e0850e9e3afdde0a7
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.c: make sure MBR signatures actually get reported
  [x86 setup] Don't use EDD to get the MBR signature
  [x86 setup] The current display page is returned in %bh, not %bl