From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 6 Jan 2006 04:43:11 +0000 (-0800)
Subject: Merge http://oss.oracle.com/git/ocfs2
X-Git-Tag: v2.6.16-rc1~474^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29552b1462799afbe02af035b243e97579d63350;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

29552b1462799afbe02af035b243e97579d63350
diff --cc Documentation/filesystems/00-INDEX
index 7e17712,2580ada..74052d2
--- a/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