Merge ath-next from ath.git

[karo-tx-linux.git] / Documentation / filesystems / ext4.txt

diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 919a3293aaa4249f81f0d907d9867d6d80f9a135..6c0108eb01372be3c879a43bd99f87305efb3277 100644 (file)
--- 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: