diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 16:12:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 16:12:21 -0700 |
| commit | 45df60cd2cbe2a8c32fd34e474b62b2b41bacf69 (patch) | |
| tree | a0f38f6d02ad1d64ca65470a85ad9ccfe28c8b4e /MAINTAINERS | |
| parent | b82b6813ff8fd741c3061c4a754ded898b69ab28 (diff) | |
| parent | cb799267bb65676277fb718cfb42239fe5c6e4fb (diff) | |
| download | blackbird-op-linux-45df60cd2cbe2a8c32fd34e474b62b2b41bacf69.tar.gz blackbird-op-linux-45df60cd2cbe2a8c32fd34e474b62b2b41bacf69.zip | |
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-- | MAINTAINERS | 11 |
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 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* |
