From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 1 Dec 2016 00:46:23 +0000 (-0700)
Subject: Merge branch 'silvio' into docs-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2fc9254d0c473e26a668d8efc75dd71146a07852;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'silvio' into docs-next
---

2fc9254d0c473e26a668d8efc75dd71146a07852
diff --cc Documentation/core-api/index.rst
index 91b3a010817a,25b4e4a4d017..2872ca1a52f1
--- a/Documentation/core-api/index.rst
+++ b/Documentation/core-api/index.rst
@@@ -11,17 -7,11 +11,20 @@@ Core utilitie
  .. toctree::
     :maxdepth: 1
  
+    assoc_array
+    atomic_ops
+    local_ops
     workqueue
  
 +Interfaces for kernel debugging
 +===============================
 +
 +.. toctree::
 +   :maxdepth: 1
 +
 +   debug-objects
 +   tracepoint
 +
  .. only::  subproject
  
     Indices