From 227539b9947c66e115ecd23db305f7b00cb89007 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Wed, 12 Dec 2012 20:28:39 -0800
Subject: [PATCH] --- yaml --- r: 347233 b: refs/heads/master c:
 cd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22a h: refs/heads/master i:   347231:
 bc80f7c3c788c26ae02fa0373f1529f7684c1ce4 v: v3

---
 [refs]                           | 2 +-
 trunk/Documentation/x86/boot.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d7fd7e166876..e7b7d6600310 100644
--- 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
index c25a53e69f1b..9a89e01d9bce 100644
--- 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