X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=MAINTAINERS;h=bf60c67668b1281a583d98c13432a3c0974d26af;hp=bdbd78d475977ad01f531e8c89a301e492339609;hb=3a926a304b9f7a74dbe67ae7dc4cb6c7a174c6c0;hpb=3bf42dfa4d831c0f64c0e430490e71b7e8c9fc4a

diff --git a/MAINTAINERS b/MAINTAINERS
index bdbd78d475..bf60c67668 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -148,18 +148,18 @@ F:	arch/arm/mach-tegra/
 F:	arch/arm/include/asm/arch-tegra*/
 
 ARM TI
-M:	Tom Rini <trini@ti.com>
+M:	Tom Rini <trini@konsulko.com>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-ti.git
-F:	arch/arm/cpu/arm926ejs/davinci/
+F:	arch/arm/mach-davinci/
+F:	arch/arm/mach-keystone/
 F:	arch/arm/cpu/arm926ejs/omap/
 F:	arch/arm/cpu/armv7/omap*/
-F:	arch/arm/include/asm/arch-davinci/
 F:	arch/arm/include/asm/arch-omap*/
 F:	arch/arm/include/asm/ti-common/
 
 ARM UNIPHIER
-M:	Masahiro Yamada <yamada.m@jp.panasonic.com>
+M:	Masahiro Yamada <yamada.masahiro@socionext.com>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-uniphier.git
 F:	arch/arm/mach-uniphier/
@@ -172,6 +172,12 @@ S:	Maintained
 F:	arch/arm/cpu/armv7/zynq/
 F:	arch/arm/include/asm/arch-zynq/
 
+ARM ZYNQMP
+M:	Michal Simek <michal.simek@xilinx.com>
+S:	Maintained
+F:	arch/arm/cpu/armv8/zynqmp/
+F:	arch/arm/include/asm/arch-zynqmp/
+
 AVR32
 M:	Andreas Bießmann <andreas.devel@googlemail.com>
 S:	Maintained
@@ -213,6 +219,7 @@ F:	drivers/usb/gadget/
 DRIVER MODEL
 M:	Simon Glass <sjg@chromium.org>
 S:	Maintained
+T:	git git://git.denx.de/u-boot-dm.git
 F:	drivers/core/
 F:	include/dm/
 F:	test/dm/
@@ -321,10 +328,11 @@ T:	git git://git.denx.de/u-boot-ppc4xx.git
 F:	arch/powerpc/cpu/ppc4xx/
 
 NETWORK
-M:	Joe Hershberger <joe.hershberger@gmail.com>
+M:	Joe Hershberger <joe.hershberger@ni.com>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-net.git
 F:	drivers/net/
+F:	net/
 
 NAND FLASH
 M:	Scott Wood <scottwood@freescale.com>
@@ -368,18 +376,13 @@ T:	git git://git.denx.de/u-boot-sparc.git
 F:	arch/sparc/
 
 SPI
-M:	Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
+M:	Jagan Teki <jteki@openedev.com>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-spi.git
 F:	drivers/mtd/spi/
 F:	drivers/spi/
 F:	include/spi*
 
-TESTING
-M:	Detlev Zundel <dzu@denx.de>
-S:	Maintained
-T:	git git://git.denx.de/u-boot-testing.git
-
 TQ GROUP
 M:	Martin Krause <martin.krause@tq-systems.de>
 S:	Maintained
@@ -411,7 +414,7 @@ T:	git git://git.denx.de/u-boot-x86.git
 F:	arch/x86/
 
 THE REST
-M:	Tom Rini <trini@ti.com>
+M:	Tom Rini <trini@konsulko.com>
 L:	u-boot@lists.denx.de
 Q:	http://patchwork.ozlabs.org/project/uboot/list/
 S:	Maintained