Merge branch 'master' of git://git.denx.de/u-boot-socfpga

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 6061139..383a4ff 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -78,6 +78,16 @@ S:   Maintained
 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
+F:     arch/arm/mach-bcm283x/
+F:     drivers/gpio/bcm2835_gpio.c
+F:     drivers/mmc/bcm2835_sdhci.c
+F:     drivers/serial/serial_bcm283x_mu.c
+F:     drivers/video/bcm2835.c
+F:     include/dm/platform_data/serial_bcm283x_mu.h
+
 ARM FREESCALE IMX
 M:     Stefano Babic <sbabic@denx.de>
 S:     Maintained
@@ -353,7 +363,7 @@ F:  drivers/net/
 F:     net/
 
 NAND FLASH
-M:     Scott Wood <scottwood@freescale.com>
+M:     Scott Wood <oss@buserror.net>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-nand-flash.git
 F:     drivers/mtd/nand/