summaryrefslogtreecommitdiffstats
path: root/Documentation/index.rst
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-10 19:24:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-10 19:24:53 +0200
commit1fb3b526df3bd7647e7854915ae6b22299408baf (patch)
treeb1fd6c9eaad0b1aff2b1df28ef1d5efcd6d7532a /Documentation/index.rst
parentMerge tag 'printk-for-5.2-fixes' of ssh://gitolite.kernel.org/pub/scm/linux/k... (diff)
parentMerge branch 'x86' into docs-next (diff)
downloadlinux-1fb3b526df3bd7647e7854915ae6b22299408baf.tar.xz
linux-1fb3b526df3bd7647e7854915ae6b22299408baf.zip
Merge tag 'docs-5.2a' of git://git.lwn.net/linux
Pull more documentation updates from Jonathan Corbet: "Some late arriving documentation changes. In particular, this contains the conversion of the x86 docs to RST, which has been in the works for some time but needed a couple of final tweaks" * tag 'docs-5.2a' of git://git.lwn.net/linux: (29 commits) Documentation: x86: convert x86_64/machinecheck to reST Documentation: x86: convert x86_64/cpu-hotplug-spec to reST Documentation: x86: convert x86_64/fake-numa-for-cpusets to reST Documentation: x86: convert x86_64/5level-paging.txt to reST Documentation: x86: convert x86_64/mm.txt to reST Documentation: x86: convert x86_64/uefi.txt to reST Documentation: x86: convert x86_64/boot-options.txt to reST Documentation: x86: convert i386/IO-APIC.txt to reST Documentation: x86: convert usb-legacy-support.txt to reST Documentation: x86: convert orc-unwinder.txt to reST Documentation: x86: convert resctrl_ui.txt to reST Documentation: x86: convert microcode.txt to reST Documentation: x86: convert pti.txt to reST Documentation: x86: convert amd-memory-encryption.txt to reST Documentation: x86: convert intel_mpx.txt to reST Documentation: x86: convert protection-keys.txt to reST Documentation: x86: convert pat.txt to reST Documentation: x86: convert mtrr.txt to reST Documentation: x86: convert tlb.txt to reST Documentation: x86: convert zero-page.txt to reST ...
Diffstat (limited to 'Documentation/index.rst')
-rw-r--r--Documentation/index.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/index.rst b/Documentation/index.rst
index fec80fee512a..9e01aace4f48 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -112,6 +112,7 @@ implementation.
.. toctree::
:maxdepth: 2
+ x86/index
sh/index
Filesystem Documentation