aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-01-31 20:23:49 -0800
committerDave Airlie <airlied@redhat.com>2013-02-08 12:02:38 +1000
commit521dfda999fd4cfe801c49d28ccc09350c0389f5 (patch)
tree5a7974c96fc44c32d35d1d152f96d039b59b1c6d /Documentation
parentx86-64: Replace left over sti/cli in ia32 audit exit code (diff)
downloadlinux-dev-521dfda999fd4cfe801c49d28ccc09350c0389f5.tar.xz
linux-dev-521dfda999fd4cfe801c49d28ccc09350c0389f5.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')
-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.