X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Documentation%2Ffilesystems%2Fext4.txt;h=6c0108eb01372be3c879a43bd99f87305efb3277;hb=5c2770079fb9b8c5bfb7113d9e76de66e77a0e24;hp=919a3293aaa4249f81f0d907d9867d6d80f9a135;hpb=1ef68ec462571955f2a667ddf1ffe279848709d7;p=pandora-kernel.git

diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 919a3293aaa4..6c0108eb0137 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -386,6 +386,10 @@ max_dir_size_kb=n	This limits the size of directories so that any
 i_version		Enable 64-bit inode version support. This option is
 			off by default.
 
+dax			Use direct access (no page cache).  See
+			Documentation/filesystems/dax.txt.  Note that
+			this option is incompatible with data=journal.
+
 Data Mode
 =========
 There are 3 different data modes: