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 ac28149aede4c15704aaee0b1941aebe30f25eb7..9922939e7d99e3dfbcd51d2dad611f745a9a4f94 100644 (file)
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -34,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
@@ -154,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.