diff --git a/[refs] b/[refs]
index 34ba4bb4a826..d1940e188f74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b2e2b73b4c84c918686c04a00724197036c0847
+refs/heads/master: d84b47115a04d9f6b0da777e8aa8cd930d5b6b8b
diff --git a/trunk/arch/arm/mm/Makefile b/trunk/arch/arm/mm/Makefile
index 21a2770226ee..1a1563f859af 100644
--- a/trunk/arch/arm/mm/Makefile
+++ b/trunk/arch/arm/mm/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_CPU_CACHE_V6)	+= cache-v6.o
 obj-$(CONFIG_CPU_COPY_V3)	+= copypage-v3.o
 obj-$(CONFIG_CPU_COPY_V4WT)	+= copypage-v4wt.o
 obj-$(CONFIG_CPU_COPY_V4WB)	+= copypage-v4wb.o
-obj-$(CONFIG_CPU_COPY_V6)	+= copypage-v6.o mmu.o
+obj-$(CONFIG_CPU_COPY_V6)	+= copypage-v6.o context.o
 obj-$(CONFIG_CPU_SA1100)	+= copypage-v4mc.o
 obj-$(CONFIG_CPU_XSCALE)	+= copypage-xscale.o
 obj-$(CONFIG_CPU_XSC3)		+= copypage-xsc3.o
diff --git a/trunk/arch/arm/mm/mmu.c b/trunk/arch/arm/mm/context.c
similarity index 97%
rename from trunk/arch/arm/mm/mmu.c
rename to trunk/arch/arm/mm/context.c
index 0d90227a0a32..79e800202424 100644
--- a/trunk/arch/arm/mm/mmu.c
+++ b/trunk/arch/arm/mm/context.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mm/mmu.c
+ *  linux/arch/arm/mm/context.c
  *
  *  Copyright (C) 2002-2003 Deep Blue Solutions Ltd, all rights reserved.
  *