Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2007-08-18 09:31:05 -07:00

parent edd5f25f74 9a5f35d4ed

commit b2d597cb6d

2 changed files with 13 additions and 43 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

54

arch/i386/boot/edd.c

View file

2

arch/i386/boot/video.c

View file