summaryrefslogtreecommitdiffstats
path: root/Documentation/x86
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-02-01 05:23:49 +0100
committerH. Peter Anvin <hpa@linux.intel.com>2013-02-01 05:23:49 +0100
commit972f7c832229781f09f03284cde484ccdb44d3ee (patch)
tree02c92edb7f257e28a961d3bf3502067078dc603a /Documentation/x86
parentMerge tag 'v3.8-rc6' into x86/urgent (diff)
downloadlinux-972f7c832229781f09f03284cde484ccdb44d3ee.tar.xz
linux-972f7c832229781f09f03284cde484ccdb44d3ee.zip
x86, doc: Boot protocol 2.12 is in 3.8
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>
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/boot.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 3edb4c2887a1..e540fd67f767 100644
--- 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.