From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 18 Aug 2017 22:01:03 +0000 (+0200)
Subject: Merge tag 'zte-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v4.14-rc1~68^2~1^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=354865087babf567491846c76e54134161dae518;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'zte-soc-4.14' of git://git.kernel.org/pub/scm/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
---

354865087babf567491846c76e54134161dae518