diff --git a/[refs] b/[refs]
index 4a17a469fad2..87c18d7a1da7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 646dd539878a194bc14b104621c0b2b33587e40f
+refs/heads/master: c32916374b2b4f4d2b7ccdb357fe7989f3b407a6
diff --git a/trunk/fs/cifs/dir.c b/trunk/fs/cifs/dir.c
index 05afe33ea644..f0b5b5f3dd2e 100644
--- a/trunk/fs/cifs/dir.c
+++ b/trunk/fs/cifs/dir.c
@@ -608,7 +608,7 @@ static int cifs_ci_compare(struct dentry *dentry, struct qstr *a,
 		 * case take precedence.  If a is not a negative dentry, this
 		 * should have no side effects
 		 */
-		memcpy(a->name, b->name, a->len);
+		memcpy((void *)a->name, b->name, a->len);
 		return 0;
 	}
 	return 1;