From 7ef6da7600e91ce876939dc2aafa03f1902cdbe1 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Mon, 23 Jul 2012 16:16:17 -0700
Subject: [PATCH] --- yaml --- r: 318415 b: refs/heads/master c:
 c5e5c42a68be66cb87573e5c2fcce6f1b5d82bd5 h: refs/heads/master i:   318413:
 07a6cd8a71d704bd0b00247eb0d1b7075943637d   318411:
 d2e081f17106fa9ea32895b04da324d3c4f45918   318407:
 e807473f03b230befde8ce90b0d2931c0a6c4434   318399:
 cda03b6599b884169e021affd384e4b74530b637 v: v3

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

diff --git a/[refs] b/[refs]
index 60c87d762479..08ca63b7a918 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd448d4d0a1bd88dc6fdc41217b2c25383fa8529
+refs/heads/master: c5e5c42a68be66cb87573e5c2fcce6f1b5d82bd5
diff --git a/trunk/Documentation/x86/boot.txt b/trunk/Documentation/x86/boot.txt
index 7c3a8801b7ce..473b32fd544e 100644
--- a/trunk/Documentation/x86/boot.txt
+++ b/trunk/Documentation/x86/boot.txt
@@ -363,7 +363,8 @@ Protocol:	2.00+
   ext_loader_type <- 0x05
   ext_loader_ver  <- 0x23
 
-  Assigned boot loader ids:
+  Assigned boot loader ids (hexadecimal):
+
 	0  LILO			(0x00 reserved for pre-2.00 bootloader)
 	1  Loadlin
 	2  bootsect-loader	(0x20, all other values reserved)
@@ -378,6 +379,8 @@ Protocol:	2.00+
 	C  Arcturus Networks uCbootloader
 	E  Extended		(see ext_loader_type)
 	F  Special		(0xFF = undefined)
+       10  Reserved
+       11  Minimal Linux Bootloader <http://sebastian-plotz.blogspot.de>
 
   Please contact <hpa@zytor.com> if you need a bootloader ID
   value assigned.