X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=MAINTAINERS;h=394be1ec323c448a182c23555c0c3c38be85a376;hb=beedbc2ea0e71c779b92e4d74b928a266d3e86f9;hp=26d0d2747996a80368d4cb52294834be7a5e2397;hpb=26f7c111fbf2828e4a59025b0f1e59c8e6484b13;p=u-boot

diff --git a/MAINTAINERS b/MAINTAINERS
index 26d0d27479..394be1ec32 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -112,12 +112,10 @@ M:	Minkyu Kang <mk7.kang@samsung.com>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-samsung.git
 F:	arch/arm/cpu/arm920t/s3c24x0/
-F:	arch/arm/cpu/armv7/exynos/
-F:	arch/arm/cpu/armv7/s5pc1xx/
+F:	arch/arm/mach-exynos/
+F:	arch/arm/mach-s5pc1xx/
 F:	arch/arm/cpu/armv7/s5p-common/
-F:	arch/arm/include/asm/arch-exynos/
 F:	arch/arm/include/asm/arch-s3c24x0/
-F:	arch/arm/include/asm/arch-s5pc1xx/
 
 ARM STM SPEAR
 M:	Vipin Kumar <vipin.kumar@st.com>
@@ -328,10 +326,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>
@@ -369,24 +368,19 @@ T:	git git://git.denx.de/u-boot-sh.git
 F:	arch/sh/
 
 SPARC
-M:	Daniel Hellstrom <daniel@gaisler.com>
+M:	Francois Retief <fgretief@spaceteq.co.za>
 S:	Maintained
 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