4 files changed, 24 insertions, 1 deletions

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 903ebc494f29..e2e74448d425 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -126,6 +126,8 @@ connector/
 	- docs on the netlink based userspace<->kernel space communication mod.
 console/
 	- documentation on Linux console drivers.
+core-api/
+	- documentation on kernel core components.
 cpu-freq/
 	- info on CPU frequency and voltage scaling.
 cpu-hotplug.txt
@@ -470,7 +472,7 @@ watchdog/
 	- how to auto-reboot Linux if it has "fallen and can't get up". ;-)
 wimax/
 	- directory with info about Intel Wireless Wimax Connections
-workqueue.txt
+core-api/workqueue.rst
 	- information on the Concurrency Managed Workqueue implementation
 x86/x86_64/
 	- directory with info on Linux support for AMD x86-64 (Hammer) machines.
diff --git a/Documentation/core-api/conf.py b/Documentation/core-api/conf.py
new file mode 100644
index 000000000000..fed87ab7f486
--- /dev/null
+++ b/Documentation/core-api/conf.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8; mode: python -*-
+
+project = "Core-API Documentation"
+
+tags.add("subproject")
diff --git a/Documentation/core-api/index.rst b/Documentation/core-api/index.rst
new file mode 100644
index 000000000000..ed3eb6499e11
--- /dev/null
+++ b/Documentation/core-api/index.rst
@@ -0,0 +1,15 @@
+======================
+Core-API Documentation
+======================
+
+Kernel and driver related documentation.
+
+.. toctree::
+   :maxdepth: 1
+
+.. only::  subproject
+
+   Indices
+   =======
+
+   * :ref:`genindex`
diff --git a/Documentation/index.rst b/Documentation/index.rst
index 85a66270f96c..3bb82fb11a4d 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -53,6 +53,7 @@ needed).
    :maxdepth: 2
 
    driver-api/index
+   core-api/index
    media/index
    gpu/index
    80211/index