From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Apr 2018 23:12:21 +0000 (-0700)
Subject: Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v5.15~9048
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45df60cd2cbe2a8c32fd34e474b62b2b41bacf69;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'armsoc-fixes' of git://git./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
---

45df60cd2cbe2a8c32fd34e474b62b2b41bacf69
diff --cc MAINTAINERS
index c7182d2,c3d57c9..b60179d
--- a/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