diff --git a/[refs] b/[refs]
index 7746dfe79a55..8138b869a27d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f1124c5bcc5e0b139930d98687db80fd4d67a1c
+refs/heads/master: 3b69915deee81842ba192c251573141ac3af86db
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index c6c9eb25f873..a6b3ea5805cb 100644
--- a/trunk/arch/x86_64/kernel/Makefile
+++ b/trunk/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ 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_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 \
+		pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc.o bugs_64.o \
 		perfctr-watchdog.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
diff --git a/trunk/arch/x86_64/kernel/bugs.c b/trunk/arch/x86_64/kernel/bugs_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/bugs.c
rename to trunk/arch/x86_64/kernel/bugs_64.c