diff --git a/[refs] b/[refs]
index 66592fa7e073..09e2287f89e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d024709deb4997aced6140a62e8ee82b10666c5f
+refs/heads/master: 27876d02b30aa34bb1ad35b81ccc40c174282f31
diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES
index dab4774ee7bb..3196d4c4eed3 100644
--- a/trunk/fs/cifs/CHANGES
+++ b/trunk/fs/cifs/CHANGES
@@ -1,3 +1,9 @@
+Version 1.35
+------------
+Add writepage performance improvements.  Fix path name conversions
+for long filenames on mounts which were done with "mapchars" mount option
+specified.
+
 Version 1.34
 ------------
 Fix error mapping of the TOO_MANY_LINKS (hardlinks) case.
diff --git a/trunk/fs/cifs/misc.c b/trunk/fs/cifs/misc.c
index 072b4ee8c53e..20ae4153f791 100644
--- a/trunk/fs/cifs/misc.c
+++ b/trunk/fs/cifs/misc.c
@@ -611,6 +611,7 @@ cifsConvertToUCS(__le16 * target, const char *source, int maxlen,
 		src_char = source[i];
 		switch (src_char) {
 			case 0:
+				target[j] = 0;
 				goto ctoUCS_out;
 			case ':':
 				target[j] = cpu_to_le16(UNI_COLON);