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 cf39c70240e86ad693b9d19e5e14dc5103c3ef0a..55c5fc174a792583be6ecad067d9750d04c8092a 100644 (file)
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -1,4 +1,8 @@
 next/fixes-non-critical
+       reset/fixes
+               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
 
 next/cleanup
        versatile/leds
@@ -14,11 +18,17 @@ next/cleanup
                git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux tags/sirf-soc-for-3.16
        vexpress/updates
                git://git.linaro.org/people/pawel.moll/linux tags/vexpress/updates-for-3.16
+       samsung/s3c24xx-clk
+               http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/s3c24xx-clk
        bcm/cleanup
                git://github.com/broadcom/mach-bcm tags/for-3.16/bcm-cleanup
        patch
-               ARM: vexpress: refine dependencies for new code
-
+               ARM: vexpress: refine dependencies for new code
+               clk: samsung: clk-s3c2410-dlck: do not use PNAME macro as it declares __initdata
+       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
 
 next/soc
        renesas/soc
@@ -48,47 +58,88 @@ next/soc
                git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-soc-3.16
        tegra/soc
                git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-3.16-soc
-       axxia/soc patches
-               ARM: dts: axxia: Add reset controller
-               power: reset: Add Axxia system reset driver
-               ARM: axxia: Adding defconfig for AXM55xx
-               ARM: dts: Device tree for AXM55xx.
-               ARM: Add platform support for LSI AXM55xx SoC
+       axxia/soc
+               Merge branch 'axxia/soc' into next/soc
        mvebu/soc2
-               git://git.infradead.org/linux-mvebu mvebu-soc-3.16-2
+               git://git.infradead.org/linux-mvebu tags/mvebu-soc-3.16-2
        qcom/soc
-               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom qcom-soc-for-3.16
+               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-soc-for-3.16
        sunxi/core2
-               https://github.com/mripard/linux sunxi-core-for-3.16-2
+               https://github.com/mripard/linux tags/sunxi-core-for-3.16-2
+       bcm/cleanup
+               Merge branch 'bcm/cleanup' into 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
+       omap/soc
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.16/soc-signed
+       omap/pm
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.16/pm-signed
+       berlin/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
 
 next/soc2
-       keystone/soc
-               depends/dma-ranges
-               git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone keystone-soc
+       renesas/soc
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-for-v3.16
+       renesas/clock
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-clock-for-v3.16
+       renesas/soc2
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc2-for-v3.16
+       at91/cleanup
+               git://github.com/at91linux/linux-at91 tags/at91-cleanup
+       mvebu/soc-orion5x
+               git://git.infradead.org/linux-mvebu tags/mvebu-soc-orion5x-3.16
+       mvebu/soc
+               git://git.infradead.org/linux-mvebu tags/mvebu-soc-3.16
+               contains depends/irqchip-mvebu
+       cleanup/kconfig
+               Merge branch 'cleanup/kconfig' into next/soc
+       renesas/clock2
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-clock2-for-v3.16
+       renesas/soc-cleanup
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-soc-cleanup-for-v3.16
+       sti/soc
+               git://git.stlinux.com/devel/kernel/linux-sti tags/sti-soc-for-v3.16
+       sunxi/core
+               https://github.com/mripard/linux tags/sunxi-core-for-3.16
+       imx/soc
+               git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-soc-3.16
+       tegra/soc
+               git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-3.16-soc
+       axxia/soc
+               Merge branch 'axxia/soc' into next/soc
+       mvebu/soc2
+               git://git.infradead.org/linux-mvebu tags/mvebu-soc-3.16-2
+       qcom/soc
+               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-soc-for-3.16
+       sunxi/core2
+               https://github.com/mripard/linux tags/sunxi-core-for-3.16-2
+       depends/dma-ranges
+               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
 
 next/defconfig
-       shmobile/defconfig
-               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-defconfig-for-v3.16
-       patch
-               ARM: multi_v7: enable AT24C EEPROM driver
-               ARM: multi_v7_defconfig: select CONFIG_GPIO_DWAPB
-               ARM: multi_v7_defconfig: Select CONFIG_MACH_BERLIN_BG2Q
-       sunxi/defconfig2
-               https://github.com/mripard/linux tags/sunxi-defconfig-for-3.16-2
        mvebu/defconfig2
                git://git.infradead.org/linux-mvebu tags/mvebu-defconfig-3.16-2
+               contains mvebu/defconfig
+       sunxi/defconfig2
+               https://github.com/mripard/linux tags/sunxi-defconfig-for-3.16-2
+               contains sunxi/defconfig
        qcom/defconfig
-               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-defconfig-for-3.16
-       tegra/defconfig
-               git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-3.16-defconfig
+               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-defconfig-for-3.16
+       <no branch> (f1e9637f4b49690a6c5793f1745f743506b1bfd1)
+               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: add drivers for Colibri T30 to multi_v7_defconfig
 
 next/boards
        shmobile/defconfig
@@ -122,6 +173,12 @@ next/boards
                https://github.com/mripard/linux tags/sunxi-defconfig-for-3.16
        tegra/defconfig
                git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-3.16-defconfig
+       renesas/r7s72100-ccf2
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-r7s72100-ccf2-for-v3.16
+       omap/boards
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.16/board-signed
+       davinci/boards
+               git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci tags/davinci-for-v3.16/board
 
 next/dt
        at91/dt
@@ -148,18 +205,36 @@ next/dt
                git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-dt-3.16
        tegra/dt
                git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-3.16-dt
+       <no branch> (702b691e4a711e699cf3cccba879c1d945665c0d)
+               Merge commit '702b691e4a71' into next/dt
+       samsung/dt
+               http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/samsung-dt
        sti/dt
-               git://git.stlinux.com/devel/kernel/linux-sti.git tags/sti-dt-for-v3.16-1
+               git://git.stlinux.com/devel/kernel/linux-sti tags/sti-dt-for-v3.16-1
+       at91/cleanup
+               Merge branch 'at91/cleanup' into next/dt
        at91/dt3
-               git://github.com/at91linux/linux-at91.git tags/at91-dt3
+               git://github.com/at91linux/linux-at91 tags/at91-dt3
        qcom/dt
-               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-dt-for-3.16
+               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-dt-for-3.16
        bcm/dt
                git://github.com/broadcom/mach-bcm tags/for-3.16/bcm-dt
        sunxi/dt2
-               https://github.com/mripard/linux.git tags/sunxi-dt-for-3.16-2
+               https://github.com/mripard/linux tags/sunxi-dt-for-3.16-2
        mvebu/dt2
-               git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.16-2
+               git://git.infradead.org/linux-mvebu tags/mvebu-dt-3.16-2
+       mvebu/soc-orion5x
+               Merge branch 'mvebu/soc-orion5x' into next/dt
+       omap/dt
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.16/dt-part2-v2
+       berlin/dt
+               https://github.com/shesselba/linux-berlin tags/berlin-dt-3.16
+       zynq/dt
+               git://git.xilinx.com/linux-xlnx tags/zynq-dt-for-3.16
+       sirf/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
 
 next/drivers
        socfpga/reset-driver
@@ -168,13 +243,38 @@ next/drivers
                git://git.infradead.org/linux-mvebu tags/mvebu-drivers-3.16
        sunxi/drivers
                https://github.com/mripard/linux sunxi/drivers-for-3.16
-       sunxi/drivers2
-               https://github.com/mripard/linux sunxi/drivers-for-3.16
+       samsung/drivers
+               http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/samsung-drivers
        qcom/socdriver
-               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-drivers-for-3.16   
-       patches
+               git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom tags/qcom-drivers-for-3.16
+       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
-               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)
+               git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci tags/davinci-fixes-for-v3.15-rc4
+       davinci/edma
+               git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci tags/davinci-for-v3.16/edma
+               contains depends/vinod-edma
+
+fixes
+       <no branch> (702b691e4a711e699cf3cccba879c1d945665c0d)
+               http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung tags/samsung-fixes
+       patch
+               ARM: imx: fix error handling in ipu device registration
+       <no branch> (4b353a706a86598ba47307c47301c3c428b79e09)
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/fixes-v3-signed
+       <no branch> (d903bc9ee9b67410d02923d98a8dd4ecf5a1bc69)
+               git://git.infradead.org/linux-mvebu tags/mvebu-fixes-3.15-2
+       <no branch> (13984e9bb15528f70059bbbbda3f9028157eebf6)
+               git://github.com/at91linux/linux-at91 tags/at91-fixes2
+       patch
+               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