]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'arm/soc' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 9 Apr 2021 19:55:43 +0000 (21:55 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 9 Apr 2021 19:55:43 +0000 (21:55 +0200)
* arm/soc:
  MAINTAINERS: Update ARM/UniPhier SoCs maintainers and status
  mailmap: Update email address for Nicolas Saenz
  MAINTAINERS: Update BCM2711/BCM2335 maintainer's mail

1  2 
.mailmap
MAINTAINERS

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge