From 86dff4b57e57931fb1fc46fff62da1d901c6c59c Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Mon, 1 Oct 2012 14:16:11 -0700 Subject: [PATCH] --- yaml --- r: 327061 b: refs/heads/master c: f7b967bffefe69f1ad8b79e263237ec1feba7b9b h: refs/heads/master i: 327059: 6a31fdaf326271f6f116e1129de8988a844d1bf4 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b3b4b41c2156..cd567222f8db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 +refs/heads/master: f7b967bffefe69f1ad8b79e263237ec1feba7b9b diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a9f1ac20a094..8443eda055dd 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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 +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 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 -M: Olof Johansson M: Stephen Warren 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