Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-drm-fsl-dcu.git] / Documentation / 00-INDEX

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 2903337d564f3feda104a9ddbe2c583bd01a6d2a..f08ca953573392ec710a27db0f7f87f14ad54527 100644 (file)
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -104,8 +104,6 @@ firmware_class/
        - request_firmware() hotplug interface info.
 floppy.txt
        - notes and driver options for the floppy disk driver.
-ftape.txt
-       - notes about the floppy tape device driver.
 hayes-esp.txt
        - info on using the Hayes ESP serial driver.
 highuid.txt
@@ -184,6 +182,8 @@ mtrr.txt
        - how to use PPro Memory Type Range Registers to increase performance.
 nbd.txt
        - info on a TCP implementation of a network block device.
+netlabel/
+       - directory with information on the NetLabel subsystem.
 networking/
        - directory with info on various aspects of networking with Linux.
 nfsroot.txt
@@ -258,6 +258,10 @@ specialix.txt
        - info on hardware/driver for specialix IO8+ multiport serial card.
 spinlocks.txt
        - info on using spinlocks to provide exclusive access in kernel.
+stable_api_nonsense.txt
+       - info on why the kernel does not have a stable in-kernel api or abi.
+stable_kernel_rules.txt
+       - rules and procedures for the -stable kernel releases.
 stallion.txt
        - info on using the Stallion multiport serial driver.
 svga.txt