ARM: SoC: document merges

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt
index 5e5935e160bee44cd8d94793e4a2a5acec16cd96..b831183899b6978c88a48c0a32d2522a4caf39dd 100644 (file)
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -1,103 +1,194 @@
 next/fixes-non-critical
-       patch
+       patch:
                ARM: cns3xxx: don't export static symbol
+       omap/fixes-non-critical (9):
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.1/fixes-0
 
 next/cleanup
-       mvebu/cleanup
+       mvebu/cleanup (1):
                git://git.infradead.org/linux-mvebu tags/mvebu-cleanup-4.1
-       at91/cleanup2
+       at91/cleanup2 (44):
                git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-cleanup2
-       renesas/soc-cleanup2
+       renesas/soc-cleanup2 (3):
                git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-cleanup2-for-v4.1
-       davinci/mcasp
+       davinci/mcasp (7):
                git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci tags/davinci-for-v4.1/mcasp
-
-next/drivers
-       drivers/simple-pm-bus
-               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-simple-pm-bus-for-v4.1
-       qcom/soc
-               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-soc-for-4.1
-
-next/multiplatform
-       renesas/soc-cleanup
-               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-cleanup-for-v4.1
-       renesas/sh7372-soc-removal
-               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-sh7372-soc-removal-for-v4.1
-       shmobile/multiplatform-r8a7778
-               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-r8a7778-ccf-and-multiplatform-for-v4.1
-               contains drivers/simple-pm-bus
-       shmobile/multiplatform-r8a73a4
-               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-r8a73a4-ccf-and-multiplatform-for-v4.1
-       shmobile/multiplatform-sh73a0
-               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-sh73a0-multiplatform-for-v4.1
-               contains renesas/dt
-       at91/multiplatform
-               git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-multiplatform
-               contains at91/cleanup2
+       omap/cleanup-legacy (3):
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/v4.1-legacy
+       renesas/pm (3):
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-pm-for-v4.1
+       renesas/cleanup3 (1):
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-cleanup3-for-v4.1
+       qcom/cleanup (366):
+               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-cleanup-for-4.1
+       imx/cleanup (13):
+               git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-cleanup-4.1
 
 next/soc
-       renesas/soc
+       renesas/soc (1):
                git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-for-v4.1
-       meson/soc
+       meson/soc (3):
                https://github.com/carlocaione/linux-meson tags/for-v4.0-rc/meson-soc
-       mvebu/soc
+       mvebu/soc (4):
                git://git.infradead.org/linux-mvebu tags/mvebu-soc-4.1
-       patch
+       patch:
                ARM: Alpine: Initial support for Alpine platform
                ARM: Alpine: early-debug print support
                ARM: Alpine: smp support
                ARM: dts: Alpine platform binding documentation
                MAINTAINERS: add maintainer for Alpine Arm machine
-       renesas/da9063-da9210-quirk
+       renesas/da9063-da9210-quirk (5):
                git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-da9063-da9210-quirk-for-v4.1
-       rk/soc
+       rk/soc (3):
                git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip tags/v4.1-rockchip-soc1
+       patch:
+               ARM: MCPM: move the algorithmic complexity to the core code
+               ARM: vexpress: migrate TC2 to the new MCPM backend abstraction
+               ARM: vexpress: DCSCB: tighten CPU validity assertion
+               ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction
+               ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction
+       omap/soc (4):
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/v4.1-soc
+       imx/soc (11):
+               git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-soc-4.1
 
 next/boards
 
 next/dt
-       renesas/dt
+       renesas/dt (32):
                git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-dt-for-v4.1
-       meson/dt
+       meson/dt (4):
                https://github.com/carlocaione/linux-meson tags/for-v4.0-rc/meson-dts
-       patch
+       patch:
                devicetree: Add TI-NSPIRE USB OTG support to device tree
-       at91/dt
+       at91/dt (31):
                git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-dt
-       broadcom/dt
+       broadcom/dt (3):
                http://github.com/broadcom/stblinux tags/arm-soc/for-4.1/devicetree
-       mvebu/dt
+       mvebu/dt (20):
                git://git.infradead.org/linux-mvebu tags/mvebu-dt-4.1
-       renesas/dt2
+       renesas/dt2 (15):
                git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-dt2-for-v4.1
-       patch
+       patch:
                ARM: dts: Alpine platform devicetree
-       bcm/dt
+       bcm/dt (4):
                http://github.com/broadcom/stblinux tags/arm-soc/for-4.1/devicetree-part-2
-       patch
+       patch:
                ARM: dts: fix typo in makefile for alpine-db
-       rk/dt
+       rk/dt (8):
                git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip tags/v4.1-rockchip-dts1
-       renesas/dt3
+       renesas/dt3 (6):
                git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-dt3-for-v4.1
+       omap/dt (27):
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/v4.1-dt
+       mvebu/dt2 (5):
+               git://git.infradead.org/linux-mvebu tags/mvebu-dt-4.1-2
+       at91/dt2 (12):
+               git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-dt2
+       bcm/dt3 (2):
+               http://github.com/broadcom/stblinux tags/arm-soc/for-4.1/devicetree-part-3
+       patch:
+               ARM: dts: fix typo in bcm7445.dtsi
+       omap/wl12xx-dt (633):
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.1/wl12xx-dt
+       patch:
+               arm: qcom: dts: gic: add compatible string for Qualcomm MSM GICs
+               mfd: qcom,tcsr: Add device tree binding for TCSR
+               arm: dts: qcom: Add TCSR support for APQ8064
+               arm: dts: qcom: Add TCSR support for IPQ8064
+               arm: dts: qcom: Add TCSR support for MSM8660
+               arm: dts: qcom: Add TCSR support for MSM8960
+               arm: dts: qcom: Add LCC nodes
+               arm: dts: qcom: Add SPMI PMIC Arbiter nodes for APQ8084 and MSM8974
+               arm: dts: qcom: Add 8x74 chipset SPMI PMIC's nodes
+               arm: dts: qcom: Add APQ8084 chipset SPMI PMIC's nodes
+               arm: dts: qcom: Add LPASS Audio HW to IPQ8064 device tree
+               dt-bindings: Add #defines for MSM8916 clocks and resets
+               devicetree: bindings: Update qcom,saw2 node bindings
+               devicetree: bindings: Document qcom,idle-states
+               ARM: dts: qcom: Add power-controller device node for 8074 Krait CPUs
+               ARM: dts: qcom: Add power-controller device node for 8084 Krait CPUs
+               ARM: dts: qcom: Update power-controller device node for 8064 Krait CPUs
+               ARM: dts: qcom: Add idle states device nodes for 8974/8074
+               ARM: dts: qcom: Add idle states device nodes for 8084
+               ARM: dts: qcom: Add idle state device nodes for 8064
+       <no branch> (03650bd2010b117c5c16a75278b0d01def8e9376) (17):
+               git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-4.1-dt
 
-next/arm64
-       patch
-               ARM64: Add new Xilinx ZynqMP SoC
-               arm64: dts: Add support for Spreadtrum SC9836 SoC in dts and Makefile
-               arm64: Add support for Spreadtrum's Sharkl64 Platform in Kconfig and defconfig
-       qcom/arm64
-               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-arm64-for-4.1
+next/drivers
+       drivers/simple-pm-bus (5):
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-simple-pm-bus-for-v4.1
+       qcom/soc (8):
+               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-soc-for-4.1
+       at91/clocksource-driver (54):
+               git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-cleanup3
+               contains at91/cleanup2
+       omap/gpmc (10):
+               git://github.com/rogerq/linux tags/gpmc-omap-for-v4.1
+       arm/perf (624):
+               git://git.kernel.org/pub/scm/linux/kernel/git/will/linux tags/arm-perf-4.1
 
 next/defconfig
-       mvebu/defconfig
+       mvebu/defconfig (1):
                git://git.infradead.org/linux-mvebu tags/mvebu-defconfig-4.1
-       patch
+       patch:
                ARM: configs: enable Marvell Armada 39x in multi_v7_defconfig
-       qcom/defconfig
+       qcom/defconfig (2):
                git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-defconfig-for-4.1
-       patch
+       patch:
                ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs
+       omap/defconfig (6):
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/v4.1-defconfig
+       renesas/defconfig (4):
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-defconfig-for-v4.1
+       mvebu/defconfig2 (1):
+               git://git.infradead.org/linux-mvebu tags/mvebu-defconfig-4.1-2
+       sunxi/defconfig (3):
+               https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux tags/sunxi-defconfig-for-4.1
+       qcom/dwefconfig (1):
+               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-defconfig-for-4.1-1
+       patch:
+               ARM: multi_v7_defconfig: Enable Tegra ACTMON support
+               ARM: multi_v7_defconfig: Enable support for ELAN i2c trackpads
+               ARM: multi_v7_defconfig: Build the Marvell WiFi-Ex driver as a module
+               ARM: multi_v7_defconfig: Add gpio-restart driver
+
+next/arm64
+       patch:
+               ARM64: Add new Xilinx ZynqMP SoC
+               arm64: dts: Add support for Spreadtrum SC9836 SoC in dts and Makefile
+               arm64: Add support for Spreadtrum's Sharkl64 Platform in Kconfig and defconfig
+       qcom/arm64 (1):
+               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-arm64-for-4.1
+       patch:
+               arm64: dts: sprd: adding coresight entries to Spreadtrum SC9836
+               arm64: dts: Add Qualcomm MSM8916 SoC and evaluation board dts
+               arm64: dts: Add Qualcomm APQ8016 SBC evaluation board dts
+               arm64: dts: add interrupt-affinity property to pmu node for juno
 
 fixes
+       patch:
+               kbuild: Create directory for target DTB
+       <no branch> (548ae94c1cc7fc120848757249b9a542b1080ffb) (1):
+               git://git.infradead.org/linux-mvebu tags/mvebu-fixes-4.0
+
+next/multiplatform
+       renesas/soc-cleanup (4):
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-cleanup-for-v4.1
+       renesas/sh7372-soc-removal (12):
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-sh7372-soc-removal-for-v4.1
+       shmobile/multiplatform-r8a7778 (21):
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-r8a7778-ccf-and-multiplatform-for-v4.1
+               contains drivers/simple-pm-bus
+       shmobile/multiplatform-r8a73a4 (13):
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-r8a73a4-ccf-and-multiplatform-for-v4.1
+       shmobile/multiplatform-sh73a0 (43):
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-sh73a0-multiplatform-for-v4.1
+               contains renesas/dt
+       at91/multiplatform (61):
+               git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-multiplatform
+               contains at91/cleanup2
+               contains at91/clocksource-driver
+       patch:
+               ARM: at91: add a Kconfig dependency on multi-platform