projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 313751f)
x86, doc: Boot protocol 2.12 is in 3.8
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Feb 2013 04:23:49 +0000 (20:23 -0800)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 02:02:38 +0000 (12:02 +1000)
The boot protocol 2.12 changes were pulled for 3.8, so update the
documentation accordingly.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Documentation/x86/boot.txt patch | blob | blame | history

diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 3edb4c2887a1f816eaf0f53f7dbf800bf73bf42a..e540fd67f767efdc855e3b2d01c8f8af1a14ef4d 100644 (file)
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -57,7 +57,7 @@ Protocol 2.10:        (Kernel 2.6.31) Added a protocol for relaxed alignment
 Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover
                protocol entry point.
 
-Protocol 2.12: (Kernel 3.9) Added the xloadflags field and extension fields
+Protocol 2.12: (Kernel 3.8) Added the xloadflags field and extension fields
                to struct boot_params for for loading bzImage and ramdisk
                above 4G in 64bit.