Merge tag 'hisi-defconfig-for-4.11' of git://github.com/hisilicon/linux-hisi into...
authorOlof Johansson <olof@lixom.net>
Mon, 30 Jan 2017 01:30:09 +0000 (17:30 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 30 Jan 2017 01:30:09 +0000 (17:30 -0800)
ARM64: hisilicon: defconfig updates for 4.11

- Enable ARM_SMMU_V3 in the arm64 defconfig
- Enable NUMA and NUMA_BALANCING in the arm64 defconfig

* tag 'hisi-defconfig-for-4.11' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: Enable NUMA and NUMA_BALANCING
  arm64: defconfig: enable SMMUv3 config

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge