]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
soc: document merges
authorArnd Bergmann <arnd@arndb.de>
Thu, 22 Apr 2021 21:23:08 +0000 (23:23 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 22 Apr 2021 21:23:08 +0000 (23:23 +0200)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/arm-soc-for-next-contents.txt

index c4a96d4db5a9b51a7f67b7cdd57889b9fb0f9261..5c4792abc0d235c76246d180b7192faf288def57 100644 (file)
@@ -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