From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 22 Apr 2021 21:23:08 +0000 (+0200)
Subject: soc: document merges
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=23b0b51551a75b334b4d4e38d9a6c2ff1ccef793;p=users%2Fjedix%2Flinux-maple.git

soc: document merges

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt
index c4a96d4db5a9b..5c4792abc0d23 100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -117,6 +117,9 @@ arm/dt
 		git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux tags/qcom-arm64-for-5.13-3
 	bcm/dt-2
 		git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc tags/bmc-5.13-devicetree-2
+	patch
+		arm64: dts: amlogic: misc DT schema fixups
+		dt-bindings: mali-bifrost: add dma-coherent
 
 arm/drivers
 	drivers/tee
@@ -197,6 +200,8 @@ arm/newsoc
 arm/late
 
 arm/fixes
+	<no branch> (4d09ccc4a81e7de6b002482af554d8b5626f5041)
+		git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux tags/sunxi-fixes-for-5.12-2
 
 arm/apple-m1
 	apple/m1-dependency