diff --git a/[refs] b/[refs]
index 234a4fea7484..aca5613d513e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad757b6aa5801b81dec609d87753604a06313c53
+refs/heads/master: d629e03b64c469245ceb07d05460e1e2eefa7585
diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
index cbdc14fddc3a..223c5e252ec1 100644
--- a/trunk/arch/i386/Makefile
+++ b/trunk/arch/i386/Makefile
@@ -61,7 +61,7 @@ AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONF
 CFLAGS += $(cflags-y)
 
 # Default subarch .c files
-mcore-y  := arch/i386/mach-default
+mcore-y  := arch/x86/mach-default
 
 # Voyager subarch support
 mflags-$(CONFIG_X86_VOYAGER)	:= -Iinclude/asm-i386/mach-voyager
@@ -73,24 +73,24 @@ mcore-$(CONFIG_X86_VISWS)	:= arch/x86/mach-visws
 
 # NUMAQ subarch support
 mflags-$(CONFIG_X86_NUMAQ)	:= -Iinclude/asm-i386/mach-numaq
-mcore-$(CONFIG_X86_NUMAQ)	:= arch/i386/mach-default
+mcore-$(CONFIG_X86_NUMAQ)	:= arch/x86/mach-default
 
 # BIGSMP subarch support
 mflags-$(CONFIG_X86_BIGSMP)	:= -Iinclude/asm-i386/mach-bigsmp
-mcore-$(CONFIG_X86_BIGSMP)	:= arch/i386/mach-default
+mcore-$(CONFIG_X86_BIGSMP)	:= arch/x86/mach-default
 
 #Summit subarch support
 mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit
-mcore-$(CONFIG_X86_SUMMIT)  := arch/i386/mach-default
+mcore-$(CONFIG_X86_SUMMIT)  := arch/x86/mach-default
 
 # generic subarchitecture
 mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
-mcore-$(CONFIG_X86_GENERICARCH) := arch/i386/mach-default
+mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default
 core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
 
 # ES7000 subarch support
 mflags-$(CONFIG_X86_ES7000)	:= -Iinclude/asm-i386/mach-es7000
-mcore-$(CONFIG_X86_ES7000)	:= arch/i386/mach-default
+mcore-$(CONFIG_X86_ES7000)	:= arch/x86/mach-default
 core-$(CONFIG_X86_ES7000)	:= arch/i386/mach-es7000/
 
 # Xen paravirtualization support
diff --git a/trunk/arch/i386/mach-default/Makefile b/trunk/arch/x86/mach-default/Makefile
similarity index 100%
rename from trunk/arch/i386/mach-default/Makefile
rename to trunk/arch/x86/mach-default/Makefile
diff --git a/trunk/arch/i386/mach-default/setup.c b/trunk/arch/x86/mach-default/setup.c
similarity index 100%
rename from trunk/arch/i386/mach-default/setup.c
rename to trunk/arch/x86/mach-default/setup.c