Merge tag 'zte-soc64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Mon, 19 Sep 2016 20:34:26 +0000 (22:34 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 19 Sep 2016 20:34:26 +0000 (22:34 +0200)
commit6f9a53ee2376329a3e8d08d852cd08540b4070b2
treef56b688fa565988c05e52a009c031a9dbd73fab3
parentdc8c76dd821329bb739a30d3e506e47c96f82f5a
parent12496aea0887fc067ad9ba0aa28798317f47a1e0
Merge tag 'zte-soc64-4.9' of git://git./linux/kernel/git/shawnguo/linux into next/arm64

Pull "ZTE arm64 SoC changes for 4.9" from Shawn Guo:
 - Add a Kconfig option for ZTE ZX SoC family support

* tag 'zte-soc64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: add ZTE ZX SoC family
arch/arm64/Kconfig.platforms