diff --git a/[refs] b/[refs]
index 79e6491ebc45..2e7e53deaed7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a89cf59b5c344e50b7be3cabb67dc1ed94439b6e
+refs/heads/master: 8bcb97659656042f3132b2814b19709856aa1335
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index ace8f9c81b96..33478f7bcc66 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -787,6 +787,13 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/mach-mx5/
 
+ARM/FREESCALE IMX6
+M:	Shawn Guo <shawn.guo@linaro.org>
+L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:	Maintained
+T:	git git://git.linaro.org/people/shawnguo/linux-2.6.git
+F:	arch/arm/mach-imx/*imx6*
+
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:	Lennert Buytenhek <kernel@wantstofly.org>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)