From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 19 Sep 2016 20:34:26 +0000 (+0200)
Subject: Merge tag 'zte-soc64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v6.1~15669^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f9a53ee2376329a3e8d08d852cd08540b4070b2;p=sdk%2Femulator%2Femulator-kernel.git

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

6f9a53ee2376329a3e8d08d852cd08540b4070b2