summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-10-01 14:16:11 -0700
committerOlof Johansson <olof@lixom.net>2012-10-01 14:16:11 -0700
commitf7b967bffefe69f1ad8b79e263237ec1feba7b9b (patch)
tree6c9364fb902aa4475688cf2db8efd95f8c507eeb
parented0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 (diff)
parentd192f93cfca6a0aedbf10fa548d8bc17b86275d6 (diff)
downloadlinux-3.10-f7b967bffefe69f1ad8b79e263237ec1feba7b9b.tar.gz
linux-3.10-f7b967bffefe69f1ad8b79e263237ec1feba7b9b.tar.bz2
linux-3.10-f7b967bffefe69f1ad8b79e263237ec1feba7b9b.zip
Merge branch 'next/maintainers' into HEAD
-rw-r--r--MAINTAINERS10
1 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a9f1ac20a09..8443eda055d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -912,6 +912,12 @@ W: http://www.digriz.org.uk/ts78xx/kernel
S: Maintained
F: arch/arm/mach-orion5x/ts78xx-*
+ARM/MICREL KS8695 ARCHITECTURE
+M: Greg Ungerer <gerg@uclinux.org>
+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+F: arch/arm/mach-ks8695
+S: Odd Fixes
+
ARM/MIOA701 MACHINE SUPPORT
M: Robert Jarzmik <robert.jarzmik@free.fr>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6793,14 +6799,14 @@ F: drivers/net/team/
F: include/linux/if_team.h
TEGRA SUPPORT
-M: Colin Cross <ccross@android.com>
-M: Olof Johansson <olof@lixom.net>
M: Stephen Warren <swarren@wwwdotorg.org>
L: linux-tegra@vger.kernel.org
Q: http://patchwork.ozlabs.org/project/linux-tegra/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
S: Supported
F: arch/arm/mach-tegra
+F: arch/arm/boot/dts/tegra*
+F: arch/arm/configs/tegra_defconfig
TEHUTI ETHERNET DRIVER
M: Andy Gospodarek <andy@greyhouse.net>