diff --git a/[refs] b/[refs]
index d715ee1ca530..a7826e119062 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1afc3f522ed088405fc8932110d338330db82bb
+refs/heads/master: e4c5c82024f5f292c0069cf40422b8f3bf5e684e
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
index 40784a944d05..d2e19f6dd72c 100644
--- a/trunk/drivers/video/fbmem.c
+++ b/trunk/drivers/video/fbmem.c
@@ -80,10 +80,12 @@ EXPORT_SYMBOL(fb_get_color_depth);
  */
 void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height)
 {
-	int i;
+	int i, j;
 
 	for (i = height; i--; ) {
-		memcpy(dst, src, s_pitch);
+		/* s_pitch is a few bytes at the most, memcpy is suboptimal */
+		for (j = 0; j < s_pitch; j++)
+			dst[j] = src[j];
 		src += s_pitch;
 		dst += d_pitch;
 	}