---

yaml --- r: 347233 b: refs/heads/master c: cd34ab8 h: refs/heads/master i: 347231: bc80f7c v: v3
git-mirror · Dec 13, 2012 · 227539b · 227539b
1 parent 4806145
commit 227539b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bfe24ac1d9d9f06b30b2909f53ea462c72cfe1d
+refs/heads/master: cd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22a
diff --git a/trunk/Documentation/x86/boot.txt b/trunk/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