Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 6 insertions, 2 deletions

diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index bcfbab899b37..74052d22d868 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -12,14 +12,16 @@ cifs.txt
         - description of the CIFS filesystem
 coda.txt
         - description of the CODA filesystem.
+configfs/
+        - directory containing configfs documentation and example code.
 cramfs.txt
         - info on the cram filesystem for small storage (ROMs etc)
 devfs/
         - directory containing devfs documentation.
+dlmfs.txt
+        - info on the userspace interface to the OCFS2 DLM.
 ext2.txt
         - info, mount options and specifications for the Ext2 filesystem.
-fat_cvf.txt
-        - info on the Compressed Volume Files extension to the FAT filesystem
 hpfs.txt
         - info and mount options for the OS/2 HPFS.
 isofs.txt
@@ -32,6 +34,8 @@ ntfs.txt
         - info and mount options for the NTFS filesystem (Windows NT).
 proc.txt
         - info on Linux's /proc filesystem.
+ocfs2.txt
+        - info and mount options for the OCFS2 clustered filesystem.
 romfs.txt
         - Description of the ROMFS filesystem.
 smbfs.txt