diff --git a/[refs] b/[refs]
index df07ee70bab1..9171985cb3a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a232a7656c085ecde659dc1dbaf65cc4fbf7ed7
+refs/heads/master: 8e59c31a0af824ddb158a7007faa66fc8ca4dbe4
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index da65eb3a6b53..402885029106 100644
--- a/trunk/arch/x86_64/kernel/Makefile
+++ b/trunk/arch/x86_64/kernel/Makefile
@@ -4,7 +4,7 @@
 
 extra-y 	:= head.o head64.o init_task_64.o vmlinux.lds
 EXTRA_AFLAGS	:= -traditional
-obj-y	:= process_64.o signal_64.o entry.o traps_64.o irq_64.o \
+obj-y	:= process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
 		ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \
 		x8664_ksyms_64.o i387_64.o syscall.o vsyscall_64.o \
 		setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry_64.S
similarity index 100%
rename from trunk/arch/x86_64/kernel/entry.S
rename to trunk/arch/x86_64/kernel/entry_64.S