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

1  2 
arch/arm64/Kconfig.platforms

Simple merge