1 files changed, 10 insertions, 13 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 43898b1a8a2d..a20df9bf8ab0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1088,33 +1088,33 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 
 ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-keystone/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 
 ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/clk/keystone/
 
 ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/clocksource/timer-keystone.c
 
 ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/power/reset/keystone-reset.c
 
 ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/memory/*emif*
@@ -2062,17 +2062,14 @@ F:	arch/arm/configs/bcm_defconfig
 F:      drivers/mmc/host/sdhci-bcm-kona.c
 F:      drivers/clocksource/bcm_kona_timer.c
 
-BROADCOM BCM2835 ARM ARCHICTURE
+BROADCOM BCM2835 ARM ARCHITECTURE
 M:      Stephen Warren <swarren@wwwdotorg.org>
 L:      linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
 S:      Maintained
-F:      arch/arm/mach-bcm/board_bcm2835.c
-F:      arch/arm/boot/dts/bcm2835*
-F:      arch/arm/configs/bcm2835_defconfig
-F:      drivers/*/*bcm2835*
+N:      bcm2835
 
-BROADCOM BCM5301X ARM ARCHICTURE
+BROADCOM BCM5301X ARM ARCHITECTURE
 M:      Hauke Mehrtens <hauke@hauke-m.de>
 L:      linux-arm-kernel@lists.infradead.org
 S:      Maintained
@@ -6687,7 +6684,7 @@ F:	arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
 M:      Javier Martinez Canillas <javier@dowhile0.org>
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 M:      Kevin Hilman <khilman@deeprootsystems.com>
 L:      linux-omap@vger.kernel.org
 S:      Maintained
@@ -9274,7 +9271,7 @@ F:	drivers/mmc/host/tifm_sd.c
 F:      include/linux/tifm.h
 
 TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-kernel@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained