diff --git a/[refs] b/[refs]
index 851b17927761..542e819790f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 807dfe7041fb1ff2b076b999800553440e61234d
+refs/heads/master: adf792928d1c57f31b92b7908a5ba383e9f05373
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 071a99674347..c9ae02a522b8 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -789,6 +789,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 T:	git git://git.pengutronix.de/git/imx/linux-2.6.git
 F:	arch/arm/mach-mx*/
+F:	arch/arm/mach-imx/
 F:	arch/arm/plat-mxc/
 
 ARM/FREESCALE IMX51
diff --git a/trunk/arch/arm/plat-mxc/system.c b/trunk/arch/arm/plat-mxc/system.c
index 45e1b5f6be44..9dad8dcc2ea9 100644
--- a/trunk/arch/arm/plat-mxc/system.c
+++ b/trunk/arch/arm/plat-mxc/system.c
@@ -21,7 +21,6 @@
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/delay.h>
-#include <linux/module.h>
 
 #include <mach/hardware.h>
 #include <mach/common.h>
@@ -31,7 +30,6 @@
 
 void (*imx_idle)(void) = NULL;
 void __iomem *(*imx_ioremap)(unsigned long, size_t, unsigned int) = NULL;
-EXPORT_SYMBOL_GPL(imx_ioremap);
 
 static void __iomem *wdog_base;