Merge http://oss.oracle.com/git/ocfs2

diff --cc Documentation/filesystems/00-INDEX
index 7e17712f32290182f34e7a2df4db431ab4f54a5d,2580ada100a071203e58ae2320fea0986d9302fe..74052d22d868f5461966291473f91e8ecdcd1d40
--- 1/Documentation/filesystems/00-INDEX
--- 2/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@@ -16,8 -18,12 +18,10 @@@ cramfs.tx
        - 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

diff --cc MAINTAINERS
Simple merge