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

diff --cc MAINTAINERS
index c7182d2a9f5ca8e9a915b34df217164f9cc64fcc,c3d57c98f8ba3b8d370b45fede9b83f3262f2f2e..b60179d948bbf79aac8a8ae15f7ff3f91b4f0cce
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1232,13 -1232,18 +1232,18 @@@ F:   Documentation/devicetree/bindings/i2
  
  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@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  S:    Maintained
  F:    drivers/clk/at91