Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fed7f97..00ace1a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5802,6 +5802,12 @@ L:       linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/amd64_edac*
 
+EDAC-ARMADA
+M:     Jan Luebbe <jlu@pengutronix.de>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/edac/armada_xp_*
+
 EDAC-AST2500
 M:     Stefan Schaeckeler <sschaeck@cisco.com>
 S:     Supported
@@ -11867,6 +11873,7 @@ S:      Maintained
 F:     arch/arm/mach-omap2/
 F:     arch/arm/plat-omap/
 F:     arch/arm/configs/omap2plus_defconfig
+F:     drivers/bus/ti-sysc.c
 F:     drivers/i2c/busses/i2c-omap.c
 F:     drivers/irqchip/irq-omap-intc.c
 F:     drivers/mfd/*omap*.c
@@ -11887,6 +11894,7 @@ F:      drivers/regulator/tps65910-regulator.c
 F:     drivers/regulator/twl-regulator.c
 F:     drivers/regulator/twl6030-regulator.c
 F:     include/linux/platform_data/i2c-omap.h
+F:     include/linux/platform_data/ti-sysc.h
 
 ONION OMEGA2+ BOARD
 M:     Harvey Hunt <harveyhuntnexus@gmail.com>