148 files changed, 1495 insertions, 1618 deletions

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index d449e632e6a..8e2da1e06e3 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -61,6 +61,7 @@ ata *);
 	ssize_t (*listxattr) (struct dentry *, char *, size_t);</