diff --git a/[refs] b/[refs]
index 0907ab9699a1..234a4fea7484 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96ae6ea0be1b902c28b3b463c27da42b41e2b63a
+refs/heads/master: ad757b6aa5801b81dec609d87753604a06313c53
diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
index 776d8dcf2340..cbdc14fddc3a 100644
--- a/trunk/arch/i386/Makefile
+++ b/trunk/arch/i386/Makefile
@@ -103,7 +103,7 @@ head-y := arch/i386/kernel/head_32.o arch/i386/kernel/init_task_32.o
 
 libs-y 					+= arch/x86/lib/
 core-y					+= arch/i386/kernel/ \
-					   arch/i386/mm/ \
+					   arch/x86/mm/ \
 					   $(mcore-y)/ \
 					   arch/x86/crypto/
 drivers-$(CONFIG_MATH_EMULATION)	+= arch/x86/math-emu/
diff --git a/trunk/arch/i386/mm/Makefile b/trunk/arch/x86/mm/Makefile
similarity index 65%
rename from trunk/arch/i386/mm/Makefile
rename to trunk/arch/x86/mm/Makefile
index 4042f8563a16..7317648e6587 100644
--- a/trunk/arch/i386/mm/Makefile
+++ b/trunk/arch/x86/mm/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/mm/Makefile_32
+include ${srctree}/arch/x86/mm/Makefile_32
 else
 include ${srctree}/arch/x86_64/mm/Makefile_64
 endif
diff --git a/trunk/arch/i386/mm/Makefile_32 b/trunk/arch/x86/mm/Makefile_32
similarity index 100%
rename from trunk/arch/i386/mm/Makefile_32
rename to trunk/arch/x86/mm/Makefile_32
diff --git a/trunk/arch/i386/mm/boot_ioremap_32.c b/trunk/arch/x86/mm/boot_ioremap_32.c
similarity index 100%
rename from trunk/arch/i386/mm/boot_ioremap_32.c
rename to trunk/arch/x86/mm/boot_ioremap_32.c
diff --git a/trunk/arch/i386/mm/discontig_32.c b/trunk/arch/x86/mm/discontig_32.c
similarity index 100%
rename from trunk/arch/i386/mm/discontig_32.c
rename to trunk/arch/x86/mm/discontig_32.c
diff --git a/trunk/arch/i386/mm/extable_32.c b/trunk/arch/x86/mm/extable_32.c
similarity index 100%
rename from trunk/arch/i386/mm/extable_32.c
rename to trunk/arch/x86/mm/extable_32.c
diff --git a/trunk/arch/i386/mm/fault_32.c b/trunk/arch/x86/mm/fault_32.c
similarity index 100%
rename from trunk/arch/i386/mm/fault_32.c
rename to trunk/arch/x86/mm/fault_32.c
diff --git a/trunk/arch/i386/mm/highmem_32.c b/trunk/arch/x86/mm/highmem_32.c
similarity index 100%
rename from trunk/arch/i386/mm/highmem_32.c
rename to trunk/arch/x86/mm/highmem_32.c
diff --git a/trunk/arch/i386/mm/hugetlbpage.c b/trunk/arch/x86/mm/hugetlbpage.c
similarity index 100%
rename from trunk/arch/i386/mm/hugetlbpage.c
rename to trunk/arch/x86/mm/hugetlbpage.c
diff --git a/trunk/arch/i386/mm/init_32.c b/trunk/arch/x86/mm/init_32.c
similarity index 100%
rename from trunk/arch/i386/mm/init_32.c
rename to trunk/arch/x86/mm/init_32.c
diff --git a/trunk/arch/i386/mm/ioremap_32.c b/trunk/arch/x86/mm/ioremap_32.c
similarity index 100%
rename from trunk/arch/i386/mm/ioremap_32.c
rename to trunk/arch/x86/mm/ioremap_32.c
diff --git a/trunk/arch/i386/mm/mmap_32.c b/trunk/arch/x86/mm/mmap_32.c
similarity index 100%
rename from trunk/arch/i386/mm/mmap_32.c
rename to trunk/arch/x86/mm/mmap_32.c
diff --git a/trunk/arch/i386/mm/pageattr_32.c b/trunk/arch/x86/mm/pageattr_32.c
similarity index 100%
rename from trunk/arch/i386/mm/pageattr_32.c
rename to trunk/arch/x86/mm/pageattr_32.c
diff --git a/trunk/arch/i386/mm/pgtable_32.c b/trunk/arch/x86/mm/pgtable_32.c
similarity index 100%
rename from trunk/arch/i386/mm/pgtable_32.c
rename to trunk/arch/x86/mm/pgtable_32.c
diff --git a/trunk/arch/x86_64/mm/Makefile b/trunk/arch/x86_64/mm/Makefile
index 4042f8563a16..7317648e6587 100644
--- a/trunk/arch/x86_64/mm/Makefile
+++ b/trunk/arch/x86_64/mm/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/mm/Makefile_32
+include ${srctree}/arch/x86/mm/Makefile_32
 else
 include ${srctree}/arch/x86_64/mm/Makefile_64
 endif
diff --git a/trunk/arch/x86_64/mm/Makefile_64 b/trunk/arch/x86_64/mm/Makefile_64
index 2e209885fce6..5c2883cad11b 100644
--- a/trunk/arch/x86_64/mm/Makefile_64
+++ b/trunk/arch/x86_64/mm/Makefile_64
@@ -8,4 +8,4 @@ obj-$(CONFIG_NUMA) += numa_64.o
 obj-$(CONFIG_K8_NUMA) += k8topology_64.o
 obj-$(CONFIG_ACPI_NUMA) += srat_64.o
 
-hugetlbpage-y = ../../i386/mm/hugetlbpage.o
+hugetlbpage-y = ../../x86/mm/hugetlbpage.o