From: Jonathan Corbet <corbet@lwn.net>
Date: Tue, 8 Nov 2016 01:58:01 +0000 (-0700)
Subject: Merge branch 'tpm' into docs-next
X-Git-Tag: Ubuntu-4.10.0-19.21~2063^2~47
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ff66c00b765382771e171801842c1c2e8116f8f3;p=mirror_ubuntu-artful-kernel.git

Merge branch 'tpm' into docs-next
---

ff66c00b765382771e171801842c1c2e8116f8f3
diff --cc Documentation/index.rst
index 3bb82fb11a4d,b4c3034ebc09..1dff9fa106bd
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -36,27 -13,13 +36,28 @@@ merged much easier
  .. toctree::
     :maxdepth: 2
  
 +   process/index
 +   dev-tools/index
     kernel-documentation
 -   media/media_uapi
 -   media/media_kapi
 -   media/dvb-drivers/index
 -   media/v4l-drivers/index
 +
 +Kernel API documentation
 +------------------------
 +
 +These books get into the details of how specific kernel subsystems work
 +from the point of view of a kernel developer.  Much of the information here
 +is taken directly from the kernel source, with supplemental material added
 +as needed (or at least as we managed to add it — probably *not* all that is
 +needed). 
 +
 +.. toctree::
 +   :maxdepth: 2
 +
 +   driver-api/index
 +   core-api/index
 +   media/index
     gpu/index
 +   80211/index
+    security/index
  
  Indices and tables
  ==================