From: Arnd Bergmann Date: Mon, 19 Apr 2021 15:42:56 +0000 (+0200) Subject: soc: document merges X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=68738a74f4c7f60fd78012af6540e77ec0f60e94;p=users%2Fjedix%2Flinux-maple.git soc: document merges Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt index 3b15e8da468f7..a276011234115 100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@ -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