Merge commit 'v2.6.29' into x86/setup-lzma

[net-next-2.6.git] / Documentation / x86 / boot.txt

diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 9ac70ffe2b7773b76da5b33f0dca52c3f756be4e..d05730e99c1f7e4bd2df1f345416e73c84b38176 100644 (file)
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -44,7 +44,7 @@ Protocol 2.07:        (Kernel 2.6.24) Added paravirtualised boot protocol.
                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
+               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