Merge tag 'at91-ab-4.15-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 2 Nov 2017 15:28:44 +0000 (16:28 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 2 Nov 2017 15:28:44 +0000 (16:28 +0100)
Pull "soc for 4.15" from Alexandre Belloni:

 - add SoC ids for the sama5d2 SiPs
 - Improve the AT91 maintainers entry

* tag 'at91-ab-4.15-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  MAINTAINERS: Add SoC drivers to AT91 entry
  drivers: soc: atmel: Add basic support for new sama5d2 SiPs

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge