x86: Kconfig: Remove deprecated CONFIG_SYS_EXTRA_OPTIONS

[platform/kernel/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 26780f4..067fb22 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -151,10 +151,10 @@ 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/
 
@@ -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>