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