From cccfbe3679c773fcbb9dd3e1461640ac6689f6ba Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mfasheh@suse.com>
Date: Tue, 7 Oct 2008 11:09:24 -0700
Subject: [PATCH] --- yaml --- r: 114406 b: refs/heads/master c:
 696b55d768ea5ebf38a369da615f8c956750ab3f h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/filesystems/ocfs2.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fd6e06167094..b9054fd21900 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cc8124584610fbe087ea2bed29ca52d2d0aa84a
+refs/heads/master: 696b55d768ea5ebf38a369da615f8c956750ab3f
diff --git a/trunk/Documentation/filesystems/ocfs2.txt b/trunk/Documentation/filesystems/ocfs2.txt
index 6acf1b4f2466..4340cc825796 100644
--- a/trunk/Documentation/filesystems/ocfs2.txt
+++ b/trunk/Documentation/filesystems/ocfs2.txt
@@ -80,3 +80,5 @@ inode64			Indicates that Ocfs2 is allowed to create inodes at
 			any location in the filesystem, including those which
 			will result in inode numbers occupying more than 32
 			bits of significance.
+user_xattr	(*)	Enables Extended User Attributes.
+nouser_xattr		Disables Extended User Attributes.