From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 4 Aug 2021 14:06:43 +0000 (+0200)
Subject: soc: document merges
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b37e897eb18e97486357d6d1c58ce0e92d42bd19;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 ee5e3f07ca8aa..69236d7ac3aa6 100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -1,4 +1,8 @@
 arm/soc
+	patch
+		ARM: ep93xx: remove MaverickCrunch support
+	at91/soc
+		git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux tags/at91-soc-5.15
 
 arm/dt
 	patch
@@ -8,10 +12,16 @@ arm/dt
 		git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel tags/renesas-arm-dt-for-v5.15-tag1
 	renesas/dt-bindings
 		git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel tags/renesas-dt-bindings-for-v5.15-tag1
+	ux500/dts
+		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik tags/ux500-dts-v5.15-1
+	at91/dt
+		git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux tags/at91-dt-5.15
 
 arm/drivers
 	renesas/driver
 		git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel tags/renesas-drivers-for-v5.15-tag1
+	ixp4xx/drivers
+		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik tags/ixp4xx-drivers-arm-soc-v5.15-1
 
 arm/defconfig
 
@@ -36,4 +46,9 @@ arm/fixes
 		git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 tags/stm32-dt-for-v5.14-fixes-1
 	<no branch> (ee7ab3f263f8131722cff3871b9618b1e7478f07)
 		git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu tags/mvebu-fixes-5.14-1
+	patch
+		soc: ixp4xx: fix printing resources
+		soc: ixp4xx/qmgr: fix invalid __iomem access
+	<no branch> (353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5)
+		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.14/fixes-rc5-signed