diff --git a/[refs] b/[refs]
index dd2a8f94a8b4..8938d642fc0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb3871daf6d95101220969dc2634456cf2c503da
+refs/heads/master: 1bbad2b6f10e1f1a171edae545ea2f84dca8c2da
diff --git a/trunk/arch/i386/lib/Makefile b/trunk/arch/i386/lib/Makefile
index dce510d443aa..af7f9435d203 100644
--- a/trunk/arch/i386/lib/Makefile
+++ b/trunk/arch/i386/lib/Makefile
@@ -3,7 +3,7 @@
 #
 
 
-lib-y = checksum_32.o delay.o usercopy.o getuser.o putuser.o memcpy.o strstr_32.o \
+lib-y = checksum_32.o delay.o usercopy.o getuser.o putuser.o memcpy_32.o strstr_32.o \
 	bitops.o semaphore_32.o string_32.o
 
 lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
diff --git a/trunk/arch/i386/lib/memcpy.c b/trunk/arch/i386/lib/memcpy_32.c
similarity index 100%
rename from trunk/arch/i386/lib/memcpy.c
rename to trunk/arch/i386/lib/memcpy_32.c