summaryrefslogtreecommitdiffstats
path: root/Documentation/mips
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2020-12-17 18:37:24 +0100
committerArnaldo Carvalho de Melo <acme@redhat.com>2020-12-17 18:37:24 +0100
commit281a94b0f2f0775a2b7825c18bccf7e4c922b7b3 (patch)
tree9c6b8a2d392a1640d84989de25e079f3758c4f1a /Documentation/mips
parentperf tools: Reformat record's control fd man text (diff)
parentMerge tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/ker... (diff)
downloadlinux-281a94b0f2f0775a2b7825c18bccf7e4c922b7b3.tar.xz
linux-281a94b0f2f0775a2b7825c18bccf7e4c922b7b3.zip
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and check what UAPI headers need to be synched. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'Documentation/mips')
-rw-r--r--Documentation/mips/features.rst3
-rw-r--r--Documentation/mips/index.rst2
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/mips/features.rst b/Documentation/mips/features.rst
new file mode 100644
index 000000000000..1973d729b29a
--- /dev/null
+++ b/Documentation/mips/features.rst
@@ -0,0 +1,3 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+.. kernel-feat:: $srctree/Documentation/features mips
diff --git a/Documentation/mips/index.rst b/Documentation/mips/index.rst
index 35cceea4e8bc..037f85a08fe3 100644
--- a/Documentation/mips/index.rst
+++ b/Documentation/mips/index.rst
@@ -11,6 +11,8 @@ MIPS-specific Documentation
booting
ingenic-tcu
+ features
+
.. only:: subproject and html
Indices