Merge git://git.denx.de/u-boot-socfpga

[people/ms/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cd350deaa70deb94d8a3971ccc874c94a88f7fc1..f7e6abd6fdc73b192d2839e8f85d2a4cb83df8bb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -78,8 +78,8 @@ T:    git git://git.denx.de/u-boot-atmel.git
 F:     arch/arm/mach-at91/
 
 ARM BROADCOM BCM283X
-M:     Stephen Warren <swarren@wwwdotorg.org>
-S:     Maintained
+#M:    Stephen Warren <swarren@wwwdotorg.org>
+S:     Orphaned (Since 2017-07)
 F:     arch/arm/mach-bcm283x/
 F:     drivers/gpio/bcm2835_gpio.c
 F:     drivers/mmc/bcm2835_sdhci.c
@@ -96,11 +96,11 @@ F:  arch/arm/cpu/arm1136/mx*/
 F:     arch/arm/cpu/arm926ejs/mx*/
 F:     arch/arm/cpu/armv7/mx*/
 F:     arch/arm/cpu/armv7/vf610/
-F:     arch/arm/imx-common/
+F:     arch/arm/mach-imx/
 F:     arch/arm/include/asm/arch-imx/
 F:     arch/arm/include/asm/arch-mx*/
 F:     arch/arm/include/asm/arch-vf610/
-F:     arch/arm/include/asm/imx-common/
+F:     arch/arm/include/asm/mach-imx/
 F:     board/freescale/*mx*/
 
 ARM HISILICON
@@ -319,17 +319,11 @@ S:        Maintained
 F:     arch/powerpc/
 
 POWERPC MPC8XX
-M:     Wolfgang Denk <wd@denx.de>
+M:     Christophe Leroy <christophe.leroy@c-s.fr>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-mpc8xx.git
 F:     arch/powerpc/cpu/mpc8xx/
 
-POWERPC MPC82XX
-M:     Wolfgang Denk <wd@denx.de>
-S:     Maintained
-T:     git git://git.denx.de/u-boot-mpc82xx.git
-F:     arch/powerpc/cpu/mpc82*/
-
 POWERPC MPC83XX
 M:     Mario Six <mario.six@gdsys.cc>
 S:     Maintained
@@ -458,6 +452,7 @@ F:  drivers/video/
 
 X86
 M:     Simon Glass <sjg@chromium.org>
+M:     Bin Meng <bmeng.cn@gmail.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-x86.git
 F:     arch/x86/