From: Olof Johansson <olof@lixom.net>
Date: Thu, 13 Aug 2015 12:48:09 +0000 (+0200)
Subject: Merge tag 'berlin64-for-v4.3-1' of git://git.infradead.org/users/hesselba/linux-berli... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=509b642ec1cb161f0e9d349bb6bd416554955b3a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'berlin64-for-v4.3-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/arm64

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

509b642ec1cb161f0e9d349bb6bd416554955b3a
diff --cc arch/arm64/boot/dts/Makefile
index 1560478d6eb2,cbabc19dff1d..d9f88330e7b0
--- a/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