Commit-ID: cd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22a Gitweb: http://git.kernel.org/tip/cd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22a Author: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> AuthorDate: Wed, 12 Dec 2012 20:28:39 -0800 Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> CommitDate: Wed, 12 Dec 2012 20:28:39 -0800 x86, doc: Document that bootloader ID 4 is used also by iPXE Etherboot -> gPXE -> iPXE... Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> Cc: Michael Brown <mbrown@xxxxxxxxxxxxxxxx> --- Documentation/x86/boot.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index c25a53e..9a89e01 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 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|