diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 21:56:42 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 21:56:42 +0100 |
| commit | 3dbff0d5e8ec9e6d0834ea889d496bc724743dfd (patch) | |
| tree | 30af8010ac1d9e0478831e0e0334dc7e12db8a8d /Documentation | |
| parent | Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd (diff) | |
| parent | x86, doc: Document that bootloader ID 4 is used also by iPXE (diff) | |
| download | linux-3dbff0d5e8ec9e6d0834ea889d496bc724743dfd.tar.xz linux-3dbff0d5e8ec9e6d0834ea889d496bc724743dfd.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull small x86 fixes from Peter Anvin:
"A collection of very small fixes, mostly pure documentation."
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, doc: Document that bootloader ID 4 is used also by iPXE
x86, doc: Add a formal bootloader ID for kexec-tools
x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/boot.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index f15cb74c4f78..406d82d5d2bb 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt @@ -373,7 +373,7 @@ Protocol: 2.00+ 1 Loadlin 2 bootsect-loader (0x20, all other values reserved) 3 Syslinux - 4 Etherboot/gPXE + 4 Etherboot/gPXE/iPXE 5 ELILO 7 GRUB 8 U-Boot @@ -381,6 +381,7 @@ Protocol: 2.00+ A Gujin B Qemu C Arcturus Networks uCbootloader + D kexec-tools E Extended (see ext_loader_type) F Special (0xFF = undefined) 10 Reserved |