X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=MAINTAINERS;h=bf60c67668b1281a583d98c13432a3c0974d26af;hp=0a0de3db47ab0fb8e17f327f763dd8ca0142eeb1;hb=30401a38543b1ed9439818c6f30d1f34909d64b5;hpb=a1d2ad6d2826040075a32955ce0c182ec3fe7950

diff --git a/MAINTAINERS b/MAINTAINERS
index 0a0de3db47..bf60c67668 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -151,15 +151,15 @@ ARM TI
 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/
@@ -328,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>
@@ -375,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