arm-soc: document new 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 55c5fc174a792583be6ecad067d9750d04c8092a..50b973405372d1ae622c429a33e4a1b9c942035a 100644 (file)
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -3,13 +3,14 @@ next/fixes-non-critical
                git://git.pengutronix.de/git/pza/linux reset/fixes
        omap/fixes-not-urgent
                git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.16/fixes-not-urgent-signed
+       patch
+               ARM: msm: Silence readb/writeb warnings due to missing IOMEM()
 
 next/cleanup
        versatile/leds
                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator tags/versatile-leds
        cleanup/kconfig
                git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux tags/kconfig-cleanups
-               contains randconfig-fixes
        renesas/cleanup
                git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-cleanup-for-v3.16
        patch
@@ -23,12 +24,14 @@ next/cleanup
        bcm/cleanup
                git://github.com/broadcom/mach-bcm tags/for-3.16/bcm-cleanup
        patch
-               ARM: vexpress: refine dependencies for new code
                clk: samsung: clk-s3c2410-dlck: do not use PNAME macro as it declares __initdata
+               ARM: vexpress: refine dependencies for new code
        omap/prcm
                git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.16/prcm-signed
        patch
                clk: samsung: fix build error
+       samsung/cleanup
+               http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/samsung-cleanup
 
 next/soc
        renesas/soc
@@ -71,9 +74,9 @@ next/soc
        bcm/soc
                git://github.com/broadcom/mach-bcm tags/for-3.16/bcm-soc
        patch
-               ARM: sunxi: allow building without reset controller
-               Documentation: devicetree: arm: sort enable-method entries
                ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE
+               Documentation: devicetree: arm: sort enable-method entries
+               ARM: sunxi: allow building without reset controller
        omap/soc
                git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.16/soc-signed
        omap/pm
@@ -82,6 +85,11 @@ next/soc
                https://github.com/shesselba/linux-berlin tags/berlin-soc-3.16
        zynq/cleanup
                git://git.xilinx.com/linux-xlnx tags/zynq-cleanup-for-3.16
+       samsung/mcpm
+               http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/exynos-mcpm
+       samsung/clk
+               http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/samsung-clk
+               contains samsung/s3c24xx-clk
 
 next/soc2
        renesas/soc
@@ -123,6 +131,8 @@ next/soc2
                Merge branch 'depends/dma-ranges' into next/soc
        keystone/soc2
                git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone tags/keystone-soc
+       keystone/soc3
+               git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone tags/keystone-soc-2
 
 next/defconfig
        mvebu/defconfig2
@@ -137,9 +147,11 @@ next/defconfig
                Merge prior defconfig changes into next/defconfig
                contains shmobile/defconfig
        patch
-               ARM: add drivers for Colibri T30 to multi_v7_defconfig
-               ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig
                ARM: configs: enable XHCI mvebu support in multi_v7_defconfig
+               ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig
+               ARM: add drivers for Colibri T30 to multi_v7_defconfig
+               ARM: at91/defconfig: sama5_defconfig: updated
+               ARM: multi_v7_defconfig: Enable Zynq peripheral drivers
 
 next/boards
        shmobile/defconfig
@@ -235,6 +247,8 @@ next/dt
                git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux tags/sirf-dts-for-3.16
        socfpga/dt2
                git://git.rocketboards.org/linux-socfpga-next tags/socfpga_dt_updates-for-3.16_take_2_version_2
+       samsung/dt2
+               http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/samsung-dt-2
 
 next/drivers
        socfpga/reset-driver
@@ -250,10 +264,10 @@ next/drivers
        sunxi/drivers2
                https://github.com/mripard/linux tags/sunxi-drivers-for-3.16-2
        patch
-               soc: qcom: fix of_device_id table
-               Documentation: sysfs: add Broadcom GISB arbiter sysfs properties
-               Documentation: devicetree: add Broadcom GISB arbiter bindings
                bus: add Broadcom GISB bus arbiter timeout/error handler
+               Documentation: devicetree: add Broadcom GISB arbiter bindings
+               Documentation: sysfs: add Broadcom GISB arbiter sysfs properties
+               soc: qcom: fix of_device_id table
        omap/l3-noc
                git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.16/l3-noc-signed
        <no branch> (cf7eb979116c2568e8bc3b6a7269c7a359864ace)
@@ -261,6 +275,13 @@ next/drivers
        davinci/edma
                git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci tags/davinci-for-v3.16/edma
                contains depends/vinod-edma
+       keystone/reset-driver
+               git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone tags/keystone-reset-driver
+       samsung/cpuidle
+               http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/exynos-cpuidle
+               contains samsung/clk
+               contains samsung/mcpm
+               contains samsung/s3c24xx-clk
 
 fixes
        <no branch> (702b691e4a711e699cf3cccba879c1d945665c0d)
@@ -277,4 +298,6 @@ fixes
                ARM: trusted_foundations: fix compile error on non-SMP
        <no branch> (68d0e40298f064a5cff40670caded0480274d4b2)
                git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/samsung-fixes-2nd-tag
+       patch
+               MAINTAINERS: Add reset controller framework entry