diff --git a/[refs] b/[refs]
index e0d867c8e746..b511f04e670e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 018977f6e7f11b08a5928641454f4c43a9b1ca43
+refs/heads/master: fff7c9a4f6689243db004b8f6d8d4ba696796f81
diff --git a/trunk/arch/i386/crypto/Makefile b/trunk/arch/i386/crypto/Makefile
index cd1038a22dd3..22671a442958 100644
--- a/trunk/arch/i386/crypto/Makefile
+++ b/trunk/arch/i386/crypto/Makefile
@@ -8,5 +8,5 @@ obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
 obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
 
 aes-i586-y := aes-i586-asm_32.o aes.o
-twofish-i586-y := twofish-i586-asm.o twofish_32.o
+twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
 
diff --git a/trunk/arch/i386/crypto/twofish-i586-asm.S b/trunk/arch/i386/crypto/twofish-i586-asm_32.S
similarity index 100%
rename from trunk/arch/i386/crypto/twofish-i586-asm.S
rename to trunk/arch/i386/crypto/twofish-i586-asm_32.S