Merge branch 'fixes-non-critical' of git://github.com/hzhuang1/linux into next/mainta...

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9b8a4c2c8edadc0b4f10dc571005958fcc63b734..187d855c7a1a6721c5a8dd4af2a825f5b111bb64 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -784,7 +784,6 @@ M:  Sascha Hauer <kernel@pengutronix.de>
 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/
 
@@ -5985,7 +5984,8 @@ F:        arch/arm/mach-s3c2410/bast-irq.c
 TI DAVINCI MACHINE SUPPORT
 M:     Sekhar Nori <nsekhar@ti.com>
 M:     Kevin Hilman <khilman@ti.com>
-L:     davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
+L:     davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
+T:     git git://gitorious.org/linux-davinci/linux-davinci.git
 Q:     http://patchwork.kernel.org/project/linux-davinci/list/
 S:     Supported
 F:     arch/arm/mach-davinci
@@ -6513,7 +6513,7 @@ F:        include/linux/if_team.h
 TEGRA SUPPORT
 M:     Colin Cross <ccross@android.com>
 M:     Olof Johansson <olof@lixom.net>
-M:     Stephen Warren <swarren@nvidia.com>
+M:     Stephen Warren <swarren@wwwdotorg.org>
 L:     linux-tegra@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git
 S:     Supported