git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
Documentation
/
x86
/
boot.txt
diff --git
a/Documentation/x86/boot.txt
b/Documentation/x86/boot.txt
index f15cb74c4f783263bba9917ec3f73755f23e09e4..406d82d5d2bb1e08a8cb9e4c548ce937f448b376 100644
(file)
--- 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
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
5 ELILO
7 GRUB
8 U-Boot
@@
-381,6
+381,7
@@
Protocol: 2.00+
A Gujin
B Qemu
C Arcturus Networks uCbootloader
A Gujin
B Qemu
C Arcturus Networks uCbootloader
+ D kexec-tools
E Extended (see ext_loader_type)
F Special (0xFF = undefined)
10 Reserved
E Extended (see ext_loader_type)
F Special (0xFF = undefined)
10 Reserved