diff --git a/[refs] b/[refs]
index dadae4370567..ac35a83633cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c1c61c408ce5e8024298259831d71d6079a9a6d
+refs/heads/master: eb102ecb73dffbbbdfccd0ea582f405b0c0cc1fe
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index d2233775e2f7..5aadea3093bc 100644
--- a/trunk/arch/x86_64/kernel/Makefile
+++ b/trunk/arch/x86_64/kernel/Makefile
@@ -6,7 +6,7 @@ extra-y 	:= head.o head64.o init_task.o vmlinux.lds
 EXTRA_AFLAGS	:= -traditional
 obj-y	:= process.o signal_64.o entry.o traps_64.o irq.o \
 		ptrace.o time.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
-		x8664_ksyms.o i387.o syscall.o vsyscall_64.o \
+		x8664_ksyms.o i387_64.o syscall.o vsyscall_64.o \
 		setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \
 		pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc.o bugs.o \
 		perfctr-watchdog.o
diff --git a/trunk/arch/x86_64/kernel/i387.c b/trunk/arch/x86_64/kernel/i387_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/i387.c
rename to trunk/arch/x86_64/kernel/i387_64.c