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

index 3b15e8da468f7a9aef59c7d448697d0cdb6bcc90..a276011234115443416a10284d4354c813e186d7 100644 (file)
@@ -111,6 +111,10 @@ arm/dt
                dt-bindings: vendor-prefixes: Add vendor prefix for M5Stack
                dt-bindings: arm: mstar: Add compatible for M5Stack UnitV2
                ARM: dts: mstar: Add a dts for M5Stack UnitV2
+       qcom/dt-3
+               git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux tags/qcom-dts-for-5.13-2
+       qcom/dt-4
+               git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux tags/qcom-arm64-for-5.13-3
 
 arm/drivers
        drivers/tee
@@ -181,6 +185,8 @@ arm/defconfig
                git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux tags/qcom-arm64-defconfig-for-5.13
        omap/defconfig
                git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.13/defconfig-signed
+       qcom/defconfig-2
+               git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux tags/qcom-defconfig-for-5.13
 
 arm/newsoc
        bmc/wpcm450