Merge tag 'zte-defconfig64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 19 Sep 2016 20:35:21 +0000 (22:35 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 19 Sep 2016 20:35:21 +0000 (22:35 +0200)
Pull "ZTE arm64 defconfig updates for 4.9" from Shawn Guo:
 - Enable ZTE ZX family support in arm64 defconfig

* tag 'zte-defconfig64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: enable ZTE ZX related config

1  2 
arch/arm64/configs/defconfig

Simple merge