Merge tag 'hi6220-soc-for-4.2' of git://github.com/hisilicon/linux-hisi into next/soc
authorKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 00:07:15 +0000 (17:07 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 00:07:15 +0000 (17:07 -0700)
ARM64: Hisilicon ARM64 SoC Updates for V4.2

- Added Hisilicon ARM64 SoC family support in Kconfig and defconfig

* tag 'hi6220-soc-for-4.2' of git://github.com/hisilicon/linux-hisi:
  arm64: Enable Hisilicon ARMv8 SoC family in Kconfig and defconfig

1  2 
arch/arm64/Kconfig

Simple merge