diff --git a/[refs] b/[refs]
index 53358f61de83..00276162a13f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b04eb6aa08ecc3e24df2f78ebc486011ebd74feb
+refs/heads/master: 4c416ab71164dc8d3f800a942fb18c4e67f67897
diff --git a/trunk/lib/string.c b/trunk/lib/string.c
index 7be6f0a87e83..064f6315b1c3 100644
--- a/trunk/lib/string.c
+++ b/trunk/lib/string.c
@@ -470,7 +470,7 @@ EXPORT_SYMBOL(memset);
 void *memcpy(void *dest, const void *src, size_t count)
 {
 	char *tmp = dest;
-	char *s = src;
+	const char *s = src;
 
 	while (count--)
 		*tmp++ = *s++;