diff --git a/[refs] b/[refs]
index 0e322a1f0cda..3e012ffc7a6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e46ebd27823b27273da780376d54c080250ff1a2
+refs/heads/master: 8c5dc70aae29d2571c0f461d69b37e4e6e01ff4c
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 0d188d95f244..b7fad009bbf6 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -213,7 +213,6 @@ static int acl_permission_check(struct inode *inode, int mask)
  * generic_permission -  check for access rights on a Posix-like filesystem
  * @inode:	inode to check access rights for
  * @mask:	right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC)
- * @flags:	IPERM_FLAG_ flags.
  *
  * Used to check for read/write/execute permissions on a file.
  * We use "fsuid" for this, letting us set arbitrary permissions