Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[deliverable/linux.git] / Documentation / filesystems / ext4.txt

diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 104322bf378c314061ae906433e0e81a9abde7e0..34ea4f1fa6ea7eefd359fb09e1605a6d6948910b 100644 (file)
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -200,12 +200,9 @@ inode_readahead_blks=n     This tuning parameter controls the maximum
                        table readahead algorithm will pre-read into
                        the buffer cache.  The default value is 32 blocks.
 
-nouser_xattr           Disables Extended User Attributes. If you have extended
-                       attribute support enabled in the kernel configuration
-                       (CONFIG_EXT4_FS_XATTR), extended attribute support
-                       is enabled by default on mount. See the attr(5) manual
-                       page and http://acl.bestbits.at/ for more information
-                       about extended attributes.
+nouser_xattr           Disables Extended User Attributes.  See the
+                       attr(5) manual page and http://acl.bestbits.at/
+                       for more information about extended attributes.
 
 noacl                  This option disables POSIX Access Control List
                        support. If ACL support is enabled in the kernel