diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-04 15:59:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-04 15:59:44 -0500 |
| commit | 3f4e5aacf754bad84dd54826ea3a77983e201c80 (patch) | |
| tree | cb2ac76d57cdcbf61e636503e36cbef992896482 /Documentation | |
| parent | 2a6f79e8c1c7d04686fc7298fd625a7bdc9453d3 (diff) | |
| parent | f76e39c531304b114e27c3dd3e0036f56cd33df1 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Three small fixlets"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/intel/cacheinfo: Shut up annoying warning
x86, doc: Boot protocol 2.12 is in 3.8
x86-64: Replace left over sti/cli in ia32 audit exit code
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/boot.txt | 2 |
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 | |||
| 57 | Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover | 57 | Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover |
| 58 | protocol entry point. | 58 | protocol entry point. |
| 59 | 59 | ||
| 60 | Protocol 2.12: (Kernel 3.9) Added the xloadflags field and extension fields | 60 | Protocol 2.12: (Kernel 3.8) Added the xloadflags field and extension fields |
| 61 | to struct boot_params for for loading bzImage and ramdisk | 61 | to struct boot_params for for loading bzImage and ramdisk |
| 62 | above 4G in 64bit. | 62 | above 4G in 64bit. |
| 63 | 63 | ||