diff --git a/[refs] b/[refs]
index a1c83a68a72c..8190103988b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6f8de3d9b124c95893054fd2a78bc7be5bb9000
+refs/heads/master: 9b8f5f573770f33b28c45255ac82e6457278c782
diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES
index 53629b8bc8a8..64dd22239b21 100644
--- a/trunk/fs/cifs/CHANGES
+++ b/trunk/fs/cifs/CHANGES
@@ -1,5 +1,6 @@
 Version 1.52
 ------------
+Fix oops on second mount to server when null auth is used.
 
 Version 1.51
 ------------
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 380ee9991f20..1102160f6661 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -1790,7 +1790,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 
 	if (volume_info.nullauth) {
 		cFYI(1, ("null user"));
-		volume_info.username = NULL;
+		volume_info.username = "";
 	} else if (volume_info.username) {
 		/* BB fixme parse for domain name here */
 		cFYI(1, ("Username: %s", volume_info.username));