Merge tag 'berlin64-for-v4.3-1' of git://git.infradead.org/users/hesselba/linux-berli...

Initial support for Marvell Berlin4CT ARM64 SoC

* tag 'berlin64-for-v4.3-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  arm64: dts: Add dts files for Marvell Berlin4CT SoC

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

diff --cc arch/arm64/boot/dts/Makefile
index 1560478d6eb26f0c112b0369c9501ff1b3df32ca,cbabc19dff1ded63e7884c0a7603dc76a044e1cd..d9f88330e7b0a033ed64e93a715ec47504cda523
--- 1/arch/arm64/boot/dts/Makefile
--- 2/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -6,9 -5,9 +6,10 @@@ dts-dirs += caviu
  dts-dirs += exynos
  dts-dirs += freescale
  dts-dirs += hisilicon
+ dts-dirs += marvell
  dts-dirs += mediatek
  dts-dirs += qcom
 +dts-dirs += rockchip
  dts-dirs += sprd
  dts-dirs += xilinx