doc: driver-model: pmic-framework.txt - cleanup

[karo-tx-uboot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ac5e211c709d27988c03f66a91774e685296cf35..9fa5a86503d94bc723435c8945547f629d9fa7a4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -329,10 +329,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>
@@ -383,11 +384,6 @@ 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