Merge branches 'acpi-spcr', 'acpi-osi', 'acpi-bus', 'acpi-scan' and 'acpi-misc'

[sfrench/cifs-2.6.git] / Documentation / 00-INDEX

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index ed3e5e949fce303efec625259b527d503cf82f8d..f35473f8c630578b76841cf61370b16d1f131ed7 100644 (file)
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -24,8 +24,6 @@ DMA-ISA-LPC.txt
        - How to do DMA with ISA (and LPC) devices.
 DMA-attributes.txt
        - listing of the various possible attributes a DMA region can have
-DocBook/
-       - directory with DocBook templates etc. for kernel documentation.
 EDID/
        - directory with info on customizing EDID for broken gfx/displays.
 IPMI.txt
@@ -40,8 +38,6 @@ Intel-IOMMU.txt
        - basic info on the Intel IOMMU virtualization support.
 Makefile
        - It's not of interest for those who aren't touching the build system.
-Makefile.sphinx
-       - It's not of interest for those who aren't touching the build system.
 PCI/
        - info related to PCI drivers.
 RCU/
@@ -264,6 +260,8 @@ logo.gif
        - full colour GIF image of Linux logo (penguin - Tux).
 logo.txt
        - info on creator of above logo & site to get additional images from.
+lsm.txt
+       - Linux Security Modules: General Security Hooks for Linux
 lzo.txt
        - kernel LZO decompressor input formats
 m68k/