cfg80211: default CONFIG_WIRELESS_OLD_REGULATORY to n

[cascardo/linux.git] / Documentation / x86 / boot.txt

diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 83c0033..7b4596a 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
@@ -349,7 +349,7 @@ Protocol:   2.00+
        3  SYSLINUX
        4  EtherBoot
        5  ELILO
-       7  GRuB
+       7  GRUB
        8  U-BOOT
        9  Xen
        A  Gujin
@@ -537,8 +537,8 @@ Type:               read
 Offset/size:   0x248/4
 Protocol:      2.08+
 
-  If non-zero then this field contains the offset from the end of the
-  real-mode code to the payload.
+  If non-zero then this field contains the offset from the beginning
+  of the protected-mode code to the payload.
 
   The payload may be compressed. The format of both the compressed and
   uncompressed data should be determined using the standard magic