X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=MAINTAINERS;h=82640e640f36be2f8dd98a54989d223a109b5a1f;hb=09ed3d5ba06137913960f9c9385f71fc384193ab;hp=12a6b2973492a82777f0cda60539117f7916b3e5;hpb=fcad3e6b576e78fce9ffca124a15de86b64453a0;p=~andy%2Flinux

diff --git a/MAINTAINERS b/MAINTAINERS
index 12a6b297349..82640e640f3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -911,11 +911,11 @@ F:	arch/arm/include/asm/hardware/dec21285.h
 F:	arch/arm/mach-footbridge/
 
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
-M:	Shawn Guo <shawn.guo@linaro.org>
+M:	Shawn Guo <shawn.guo@freescale.com>
 M:	Sascha Hauer <kernel@pengutronix.de>
 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
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 F:	arch/arm/mach-imx/
 F:	arch/arm/boot/dts/imx*
 F:	arch/arm/configs/imx*_defconfig