Merge branch 'silvio' into docs-next

2016-11-30 17:46:23 -07:00
parent c339665666 326bc876fe
commit 2fc9254d0c
7 changed files with 930 additions and 914 deletions
--- a/Documentation/core-api/index.rst
+++ b/Documentation/core-api/index.rst
@@ -11,6 +11,9 @@ Core utilities
 .. toctree::
   :maxdepth: 1

+   assoc_array
+   atomic_ops
+   local_ops
   workqueue

 Interfaces for kernel debugging