diff --git a/[refs] b/[refs]
index ce74d94a7eb1..10d2e9220def 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16abbecdad3367c76c12537450eba0d86943fe2c
+refs/heads/master: cb8be64084e6294fcb9e558188fe104050b94f0b
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 134195cc4073..f784b70abfeb 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -1078,7 +1078,8 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol)
                         vol->nocase = 1;
 		} else if (strnicmp(data, "brl", 3) == 0) {
 			vol->nobrl =  0;
-		} else if (strnicmp(data, "nobrl", 5) == 0) {
+		} else if ((strnicmp(data, "nobrl", 5) == 0) || 
+			   (strnicmp(data, "nolock", 6)) {
 			vol->nobrl =  1;
 			/* turn off mandatory locking in mode
 			if remote locking is turned off since the