summaryrefslogtreecommitdiff
path: root/Documentation/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-03-08 11:57:58 +0300
committerIngo Molnar <mingo@kernel.org>2020-03-08 11:57:58 +0300
commit6120681bdf1a1c648e8c555704b71e04abe2e899 (patch)
treea8a3f55c4ed771dc57082d8af2f8d28ab6e5d341 /Documentation/x86
parent3be5f0d286dc944dee65fdcbddfc4d314f7d4482 (diff)
parentd6c066fda90d578aacdf19771a027ed484a79825 (diff)
downloadlinux-6120681bdf1a1c648e8c555704b71e04abe2e899.tar.xz
Merge branch 'efi/urgent' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/index.rst1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst
index a8de2fbc1caa..265d9e9a093b 100644
--- a/Documentation/x86/index.rst
+++ b/Documentation/x86/index.rst
@@ -19,7 +19,6 @@ x86-specific Documentation
tlb
mtrr
pat
- intel_mpx
intel-iommu
intel_txt
amd-memory-encryption