diff --git a/[refs] b/[refs]
index a9804018ea33..298da443a2ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76ea2ec68b54acc13ee1bfbb9a4e3aad370a374f
+refs/heads/master: deb8677148fef3aea11edd4e980f6eb9c564f3cd
diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
index 56ea4250f982..45409c13f6ef 100644
--- a/trunk/arch/i386/Makefile
+++ b/trunk/arch/i386/Makefile
@@ -99,7 +99,7 @@ core-$(CONFIG_XEN)		+= arch/i386/xen/
 # default subarch .h files
 mflags-y += -Iinclude/asm-i386/mach-default
 
-head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task_32.o
+head-y := arch/i386/kernel/head_32.o arch/i386/kernel/init_task_32.o
 
 libs-y 					+= arch/i386/lib/
 core-y					+= arch/i386/kernel/ \
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index d5367aa2510d..6ecf97da63b0 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-extra-y := head.o init_task_32.o vmlinux.lds
+extra-y := head_32.o init_task_32.o vmlinux.lds
 
 obj-y	:= process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
 		ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \
diff --git a/trunk/arch/i386/kernel/head.S b/trunk/arch/i386/kernel/head_32.S
similarity index 100%
rename from trunk/arch/i386/kernel/head.S
rename to trunk/arch/i386/kernel/head_32.S