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)
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


Trivial merge