Merge tag 'zte-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Fri, 18 Aug 2017 22:01:03 +0000 (00:01 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 18 Aug 2017 22:01:03 +0000 (00:01 +0200)
commit354865087babf567491846c76e54134161dae518
tree3f7ecc11b14710dd4d4a461ea21fc15120a512fb
parent32f4049a1f62abe95a3f1da83402d510a6ec5487
parent03d95c264a0277418e21cbb9043c12bf0604be05
Merge tag 'zte-soc-4.14' of git://git./linux/kernel/git/shawnguo/linux into next/arm64

Pull "ZTE SoC updates for 4.14" from Shawn Guo:

 - Select PINCTRL for ZTE platform, so that pinctrl driver for ZX296718
   can be enabled.

* tag 'zte-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: select PINCTRL for ZTE platform