diff options
-rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a9f1ac20a094..8443eda055dd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -912,6 +912,12 @@ W: http://www.digriz.org.uk/ts78xx/kernel | |||
912 | S: Maintained | 912 | S: Maintained |
913 | F: arch/arm/mach-orion5x/ts78xx-* | 913 | F: arch/arm/mach-orion5x/ts78xx-* |
914 | 914 | ||
915 | ARM/MICREL KS8695 ARCHITECTURE | ||
916 | M: Greg Ungerer <gerg@uclinux.org> | ||
917 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
918 | F: arch/arm/mach-ks8695 | ||
919 | S: Odd Fixes | ||
920 | |||
915 | ARM/MIOA701 MACHINE SUPPORT | 921 | ARM/MIOA701 MACHINE SUPPORT |
916 | M: Robert Jarzmik <robert.jarzmik@free.fr> | 922 | M: Robert Jarzmik <robert.jarzmik@free.fr> |
917 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 923 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
@@ -6793,14 +6799,14 @@ F: drivers/net/team/ | |||
6793 | F: include/linux/if_team.h | 6799 | F: include/linux/if_team.h |
6794 | 6800 | ||
6795 | TEGRA SUPPORT | 6801 | TEGRA SUPPORT |
6796 | M: Colin Cross <ccross@android.com> | ||
6797 | M: Olof Johansson <olof@lixom.net> | ||
6798 | M: Stephen Warren <swarren@wwwdotorg.org> | 6802 | M: Stephen Warren <swarren@wwwdotorg.org> |
6799 | L: linux-tegra@vger.kernel.org | 6803 | L: linux-tegra@vger.kernel.org |
6800 | Q: http://patchwork.ozlabs.org/project/linux-tegra/list/ | 6804 | Q: http://patchwork.ozlabs.org/project/linux-tegra/list/ |
6801 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git | 6805 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git |
6802 | S: Supported | 6806 | S: Supported |
6803 | F: arch/arm/mach-tegra | 6807 | F: arch/arm/mach-tegra |
6808 | F: arch/arm/boot/dts/tegra* | ||
6809 | F: arch/arm/configs/tegra_defconfig | ||
6804 | 6810 | ||
6805 | TEHUTI ETHERNET DRIVER | 6811 | TEHUTI ETHERNET DRIVER |
6806 | M: Andy Gospodarek <andy@greyhouse.net> | 6812 | M: Andy Gospodarek <andy@greyhouse.net> |