Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c7182d2..b60179d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1232,10 +1232,15 @@ F:      Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
 
 ARM/ASPEED MACHINE SUPPORT
 M:     Joel Stanley <joel@jms.id.au>
-S:     Maintained
+R:     Andrew Jeffery <andrew@aj.id.au>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+Q:     https://patchwork.ozlabs.org/project/linux-aspeed/list/
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 F:     arch/arm/mach-aspeed/
 F:     arch/arm/boot/dts/aspeed-*
-F:     drivers/*/*aspeed*
+N:     aspeed
 
 ARM/ATMEL AT91 Clock Support
 M:     Boris Brezillon <boris.brezillon@bootlin.com>
@@ -1743,7 +1748,7 @@ F:        arch/arm/mach-orion5x/ts78xx-*
 ARM/OXNAS platform support
 M:     Neil Armstrong <narmstrong@baylibre.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:     linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
+L:     linux-oxnas@groups.io (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-oxnas/
 F:     arch/arm/boot/dts/ox8*.dts*