From: Linus Torvalds Date: Sat, 18 Aug 2007 16:31:05 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux... X-Git-Tag: v2.6.23-rc4~132 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=b2d597cb6d64d5e30236273249e3790434387743 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 --- b2d597cb6d64d5e30236273249e3790434387743