Merge ath-next from ath.git

[karo-tx-linux.git] / Documentation / filesystems / 00-INDEX

diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 632211cbdd569292b4f8c2e47676a0d0b66049a9..9922939e7d99e3dfbcd51d2dad611f745a9a4f94 100644 (file)
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -2,6 +2,8 @@
        - this file (info on some of the filesystems supported by linux).
 Locking
        - info on locking rules as they pertain to Linux VFS.
+Makefile
+       - Makefile for building the filsystems-part of DocBook.
 9p.txt
        - 9p (v9fs) is an implementation of the Plan 9 remote fs protocol.
 adfs.txt
@@ -32,6 +34,9 @@ configfs/
        - directory containing configfs documentation and example code.
 cramfs.txt
        - info on the cram filesystem for small storage (ROMs etc).
+dax.txt
+       - info on avoiding the page cache for files stored on CPU-addressable
+         storage devices.
 debugfs.txt
        - info on the debugfs filesystem.
 devpts.txt
@@ -152,5 +157,3 @@ xfs-self-describing-metadata.txt
        - info on XFS Self Describing Metadata.
 xfs.txt
        - info and mount options for the XFS filesystem.
-xip.txt
-       - info on execute-in-place for file mappings.