summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-11 19:12:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-11 19:12:21 -0400
commit45df60cd2cbe2a8c32fd34e474b62b2b41bacf69 (patch)
treea0f38f6d02ad1d64ca65470a85ad9ccfe28c8b4e /MAINTAINERS
parentb82b6813ff8fd741c3061c4a754ded898b69ab28 (diff)
parentcb799267bb65676277fb718cfb42239fe5c6e4fb (diff)
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "Here is a very small set of fixes for inclusion in linux-4.17-rc1: Two changes for the maintainer file, and one more fix for the newly added npcm platform, to enable the level 2 cache controller" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: MAINTAINERS: Update ASPEED entry with details MAINTAINERS: Migrate oxnas list to groups.io arm: npcm: enable L2 cache in NPCM7xx architecture
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS11
1 files changed, 8 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c7182d2a9f5c..b60179d948bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1232,10 +1232,15 @@ F: Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
1232 1232
1233ARM/ASPEED MACHINE SUPPORT 1233ARM/ASPEED MACHINE SUPPORT
1234M: Joel Stanley <joel@jms.id.au> 1234M: Joel Stanley <joel@jms.id.au>
1235S: Maintained 1235R: Andrew Jeffery <andrew@aj.id.au>
1236L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1237L: linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
1238Q: https://patchwork.ozlabs.org/project/linux-aspeed/list/
1239S: Supported
1240T: git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
1236F: arch/arm/mach-aspeed/ 1241F: arch/arm/mach-aspeed/
1237F: arch/arm/boot/dts/aspeed-* 1242F: arch/arm/boot/dts/aspeed-*
1238F: drivers/*/*aspeed* 1243N: aspeed
1239 1244
1240ARM/ATMEL AT91 Clock Support 1245ARM/ATMEL AT91 Clock Support
1241M: Boris Brezillon <boris.brezillon@bootlin.com> 1246M: Boris Brezillon <boris.brezillon@bootlin.com>
@@ -1743,7 +1748,7 @@ F: arch/arm/mach-orion5x/ts78xx-*
1743ARM/OXNAS platform support 1748ARM/OXNAS platform support
1744M: Neil Armstrong <narmstrong@baylibre.com> 1749M: Neil Armstrong <narmstrong@baylibre.com>
1745L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1750L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1746L: linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers) 1751L: linux-oxnas@groups.io (moderated for non-subscribers)
1747S: Maintained 1752S: Maintained
1748F: arch/arm/mach-oxnas/ 1753F: arch/arm/mach-oxnas/
1749F: arch/arm/boot/dts/ox8*.dts* 1754F: arch/arm/boot/dts/ox8*.dts*