From 50248d81cf2bd0d329cff757464c69e4168b8091 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@fieldses.org>
Date: Wed, 11 Jan 2006 16:55:00 -0500
Subject: [PATCH] --- yaml --- r: 19711 b: refs/heads/master c:
 0d419a6a95ee158675aa184c6c3e476b22d02145 h: refs/heads/master i:   19709:
 211d3561cc880df98b2a9a9ebbdf26dee44a5634   19707:
 6972899528df40b9c330c3e619350d7885b35754   19703:
 151ea2a2977119c367b46c0472728476e377b730   19695:
 1ab356c43638caf41c0aa9916a10ad645c26dad2   19679:
 ef2c50917f38e9e496e47331fe3435094c911cb1   19647:
 83e5caee0c24a8cd3a8a072fb8e824f0a08f64be   19583:
 f695cbe9ff0fd5e820214a00eb435d1aecbc9492   19455:
 817dcf06711f146c87653a617271eb1ca79eb142 v: v3

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

diff --git a/[refs] b/[refs]
index ccdd3cc99bae..1c7201d8a448 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 251b6eccbeff4f0f8a3509769b327705e899f5dd
+refs/heads/master: 0d419a6a95ee158675aa184c6c3e476b22d02145
diff --git a/trunk/Documentation/filesystems/ocfs2.txt b/trunk/Documentation/filesystems/ocfs2.txt
index f2595caf052e..4389c684a80a 100644
--- a/trunk/Documentation/filesystems/ocfs2.txt
+++ b/trunk/Documentation/filesystems/ocfs2.txt
@@ -35,6 +35,7 @@ Features which OCFS2 does not support yet:
 	  be cluster coherent.
 	- quotas
 	- cluster aware flock
+	- cluster aware lockf
 	- Directory change notification (F_NOTIFY)
 	- Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
 	- POSIX ACLs