aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9b8a4c2c8eda..187d855c7a1a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -784,7 +784,6 @@ M: Sascha Hauer <kernel@pengutronix.de>
784L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 784L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
785S: Maintained 785S: Maintained
786T: git git://git.pengutronix.de/git/imx/linux-2.6.git 786T: git git://git.pengutronix.de/git/imx/linux-2.6.git
787F: arch/arm/mach-mx*/
788F: arch/arm/mach-imx/ 787F: arch/arm/mach-imx/
789F: arch/arm/plat-mxc/ 788F: arch/arm/plat-mxc/
790 789
@@ -5985,7 +5984,8 @@ F: arch/arm/mach-s3c2410/bast-irq.c
5985TI DAVINCI MACHINE SUPPORT 5984TI DAVINCI MACHINE SUPPORT
5986M: Sekhar Nori <nsekhar@ti.com> 5985M: Sekhar Nori <nsekhar@ti.com>
5987M: Kevin Hilman <khilman@ti.com> 5986M: Kevin Hilman <khilman@ti.com>
5988L: davinci-linux-open-source@linux.davincidsp.com (subscribers-only) 5987L: davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
5988T: git git://gitorious.org/linux-davinci/linux-davinci.git
5989Q: http://patchwork.kernel.org/project/linux-davinci/list/ 5989Q: http://patchwork.kernel.org/project/linux-davinci/list/
5990S: Supported 5990S: Supported
5991F: arch/arm/mach-davinci 5991F: arch/arm/mach-davinci
@@ -6513,7 +6513,7 @@ F: include/linux/if_team.h
6513TEGRA SUPPORT 6513TEGRA SUPPORT
6514M: Colin Cross <ccross@android.com> 6514M: Colin Cross <ccross@android.com>
6515M: Olof Johansson <olof@lixom.net> 6515M: Olof Johansson <olof@lixom.net>
6516M: Stephen Warren <swarren@nvidia.com> 6516M: Stephen Warren <swarren@wwwdotorg.org>
6517L: linux-tegra@vger.kernel.org 6517L: linux-tegra@vger.kernel.org
6518T: git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git 6518T: git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git
6519S: Supported 6519S: Supported