diff --git a/[refs] b/[refs]
index e2320e8ca820..64a70bcd3132 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7950ca5d01f6cb5ec99ccd8548ef6a55c9ea2690
+refs/heads/master: 201962c9d38bc57b4764ecd03068902f8d2ad54c
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index 6905cdfe75fb..7a71d0e7d48a 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.o vmlinux.lds
 EXTRA_AFLAGS	:= -traditional
-obj-y	:= process.o signal_64.o entry.o traps_64.o irq.o \
+obj-y	:= process.o signal_64.o entry.o traps_64.o irq_64.o \
 		ptrace_64.o time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_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 \
diff --git a/trunk/arch/x86_64/kernel/irq.c b/trunk/arch/x86_64/kernel/irq_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/irq.c
rename to trunk/arch/x86_64/kernel/irq_64.c