From e7e05f8906c77ceac40dbe17a511849938d89790 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Sun, 27 Apr 2008 12:21:11 +0100
Subject: [PATCH] --- yaml --- r: 94835 b: refs/heads/master c:
 4c0587e6e42c5b679234d3dffda8a888dc0ff9c1 h: refs/heads/master i:   94833:
 203d82f3508e75504e4b70d43d3f2ba5844647a3   94831:
 ae6fac2e34c4cf6f18fff566fc725b53154ac1a9 v: v3

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

diff --git a/[refs] b/[refs]
index b2c7d0c51d80..885ed2b7d792 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 781fe2ebc0f44b32418d203ac023a541afdd042f
+refs/heads/master: 4c0587e6e42c5b679234d3dffda8a888dc0ff9c1
diff --git a/trunk/Documentation/i386/boot.txt b/trunk/Documentation/i386/boot.txt
index 0fac3465f2e3..95ad15c3b01f 100644
--- a/trunk/Documentation/i386/boot.txt
+++ b/trunk/Documentation/i386/boot.txt
@@ -40,9 +40,17 @@ Protocol 2.05:	(Kernel 2.6.20) Make protected mode kernel relocatable.
 		Introduce relocatable_kernel and kernel_alignment fields.
 
 Protocol 2.06:	(Kernel 2.6.22) Added a field that contains the size of
-		the boot command line
+		the boot command line.
 
-Protocol 2.09:	(kernel 2.6.26) Added a field of 64-bit physical
+Protocol 2.07:	(Kernel 2.6.24) Added paravirtualised boot protocol.
+		Introduced hardware_subarch and hardware_subarch_data
+		and KEEP_SEGMENTS flag in load_flags.
+
+Protocol 2.08:	(Kernel 2.6.26) Added crc32 checksum and ELF format
+		payload. Introduced payload_offset and payload length
+		fields to aid in locating the payload.
+
+Protocol 2.09:	(Kernel 2.6.26) Added a field of 64-bit physical
 		pointer to single linked list of struct	setup_data.
 
 **** MEMORY LAYOUT