Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7b967bf authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/maintainers' into HEAD

parents ed0a0ed0 d192f93c
Loading
Loading
Loading
Loading
+8 −2
Original line number Original line Diff line number Diff line
@@ -912,6 +912,12 @@ W: http://www.digriz.org.uk/ts78xx/kernel
S:	Maintained
S:	Maintained
F:	arch/arm/mach-orion5x/ts78xx-*
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
ARM/MIOA701 MACHINE SUPPORT
M:	Robert Jarzmik <robert.jarzmik@free.fr>
M:	Robert Jarzmik <robert.jarzmik@free.fr>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
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
F:	include/linux/if_team.h


TEGRA SUPPORT
TEGRA SUPPORT
M:	Colin Cross <ccross@android.com>
M:	Olof Johansson <olof@lixom.net>
M:	Stephen Warren <swarren@wwwdotorg.org>
M:	Stephen Warren <swarren@wwwdotorg.org>
L:	linux-tegra@vger.kernel.org
L:	linux-tegra@vger.kernel.org
Q:	http://patchwork.ozlabs.org/project/linux-tegra/list/
Q:	http://patchwork.ozlabs.org/project/linux-tegra/list/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
S:	Supported
S:	Supported
F:	arch/arm/mach-tegra
F:	arch/arm/mach-tegra
F:	arch/arm/boot/dts/tegra*
F:	arch/arm/configs/tegra_defconfig


TEHUTI ETHERNET DRIVER
TEHUTI ETHERNET DRIVER
M:	Andy Gospodarek <andy@greyhouse.net>
M:	Andy Gospodarek <andy@greyhouse.net>