]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'berlin64-soc-for-4.5-1' of git://git.infradead.org/users/hesselba/linux...
authorArnd Bergmann <arnd@arndb.de>
Sat, 12 Dec 2015 00:20:45 +0000 (01:20 +0100)
committerArnd Bergmann <arnd@arndb.de>
Sat, 12 Dec 2015 00:20:45 +0000 (01:20 +0100)
Merge "Marvell Berlin64 SoC changes (round 1)" from Sebastian Hesselbarth:

- add PINCTRL dependency

* tag 'berlin64-soc-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs

1  2 
arch/arm64/Kconfig.platforms

Simple merge