From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Jun 2013 20:19:48 +0000 (+0200)
Subject: Merge branch 'next/dt' into for-next
X-Git-Tag: next-20130628~18^2~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5eeeacb88b56f4156facd4f9d64ccc63ea184004;p=karo-tx-linux.git

Merge branch 'next/dt' into for-next
---

5eeeacb88b56f4156facd4f9d64ccc63ea184004
diff --cc arch/arm/arm-soc-for-next-contents.txt
index bd52e825f200,000000000000..4abc9ab466ba
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,250 -1,0 +1,254 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +	<topic branch>
 +		<contents>
 +		<...>
 +	<...>
 +
 +depends/rmk-devel-stable
 +	http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable
 +
 +next/fixes-non-critical
 +	mvebu/fixes-non-critical
 +		git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +	sirf/fixes-non-critical
 +		git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes
 +	omap/fixes-non-critical
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-non-critical-signed           
 +	davinci/board
 +		git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.11/board
 +	msm/fixes
 +		git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-for-3.11
 +	patches
 +		MAINTAINERS: ARM: SIRF: add the source code tree path
 +		ARM: dts: msm: Fix merge resolution
 +		clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
 +		X.509: do not emit any informational output
 +		mtd: omap2: allow bulding as a module
 +		[SCSI] nsp32: use mdelay instead of large udelay constants
 +		hwrng: bcm2835: fix MODULE_LICENSE tag
 +		ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
 +	at91/fixes
 +		git://github.com/at91linux/linux-at91.git tags/at91-fixes
 +	exynos/fixes
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/non-critical-fixes-1
 +
 +next/cleanup
 +	at91/cleanup
 +		git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +	machdesc/cleanup
 +		git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +	mvebu/cleanup
 +		git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +	dt/pci-helpers
 +		git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11
 +	omap/cleanup
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
 +	mvebu/cleanup4
 +		git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-4
 +	msm/cleanup
 +		git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-for-3.11
 +	sunxi/core
 +		git://github.com/mripard/linux.git tags/sunxi-core-for-3.11
 +	zynq/cleanup
 +		git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.11
 +	at91/cleanup2
 +		git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +	picoxcell/cleanup
 +		git://github.com/jamieiles/linux-2.6-ji.git picoxcell-next
 +	omap/pm-serial-cleanup
 +		git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm-serial
 +	omap/pm-voltdomain-cleanup
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-voltdomain-signed
 +	omap/dma-cleanup
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/dma-signed
 +	samsung/cleanup
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-cleanup-1
 +
 +next/soc
 +	mvebu/soc
 +		git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +	mvebu/defconfig
 +		git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3
 +	mvebu/pcie
 +		git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2
 +	mvebu/pcie-kirkwood
 +		git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11
 +	mvebu/pcie2
 +		git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11
 +	mvebu/clk-cleanup
 +		git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11
 +	vexpress/dual-cluster
 +		git://git.linaro.org/people/nico/linux VExpress_DCSCB
 +		depends on depends/rmk-devel-stable
 +		+patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build"
 +	zynq/clk
 +		git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-3.11
 +	mvebu/pcie-kirkwood2
 +		git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11-2
 +	renesas/pinmux-gpio
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.11
 +	renesas/soc
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
 +	clps711x/soc
 +		patches
 +			GPIO: clps711x: Rewrite driver for using generic GPIO cod
 +			GPIO: clps711x: Add DT support
 +			ARM: clps711x: Re-add GPIO support
 +			ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency
 +			ARM: clps711x: Set PLL clock to zero if we work from 13 mHz sourc
 +			ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file
 +			ARM: clps711x: autcpu12: Add support for NOR flash
 +			ARM: clps711x: autcpu12: Special driver for handling memory is re
 +			ARM: clps711x: autcpu12: Move remaining specific definitions to b
 +			ARM: clps711x: p720t: Define PLD registers as GPIOs
 +			ARM: clps711x: Move specific definitions from hardware.h to board
 +			ARM: clps711x: Replace "arch_initcall" in common code with ".init
 +			ARM: clps711x: Add clocksource framework
 +			ARM: clps711x: Optimize interrupt handling
 +			ARM: clps711x: edb7211: Add support for I2C
 +			ARM: clps711x: edb7211: Control LCD backlight via PWM
 +			ARM: clps711x: Add support for SYSCON driver
 +			ARM: clps711x: Update defconfig
 +	patches
 +		ARM: socfpga: Add support to gate peripheral clocks
 +		ARM: socfpga: Add syscon to be part of socfpga
 +	samsung/s3c24xx-arch
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-arch-1
 +	omap/pm
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-signed
 +	omap/soc
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +	omap/omap5
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-signed
 +	mvebu/regmap
 +		git://git.infradead.org/users/jcooper/linux.git tags/regmap-3.11
 +			depends on cleanup and fixes-non-critical branches
 +	renesas/usb
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-phy-rcar-usb-for-v3.11
 +	renesas/soc2
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.11
 +	tegra/soc
 +		git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.11-soc
 +	keystone/soc
 +		git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-soc-for-arm-soc
 +	integrator/pci
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-pci-for-arm-soc
 +	u300/multiplatform
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/u300-multiplatform
 +	imx/soc
 +		git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.11
 +	davinci/soc
 +		git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.11/soc-v2
 +i	sunxi/defconfig
 +		git://github.com/mripard/linux.git tags/sunxi-defconfig-for-3.11
 +	sunxi/core2
 +		git://github.com/mripard/linux.git tags/sunxi-core-for-3.11-2
 +	omap/soc2
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-part2-signed
 +	samsung/exynos-arch
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-arch-2
 +
 +next/boards
 +	mvebu/boards
 +		  git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +	renesas/defconfig
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.11
 +	renesas/boards
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.11
 +		depends on renesas/pinmux-gpio
 +		depends on renesas/soc
 +	ux500/core
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-for-arm-soc
 +	ux500/pinctrl
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-pinctrl-for-arm-soc
 +	patch
 +		"ARM: ux500: board-mop500: remove unused pin modes"
 +	bcm2835/defconfig
 +		git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.11-defconfig
 +	renesas/defconfig2
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig2-for-v3.11
 +	tegra/defconfig
 +		git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.11-defconfig
 +	omap/boards
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/mailbox-signed
 +
 +next/dt
 +	nomadik/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +	mvebu/dt
 +		git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3
 +	patch
 +		"ARM: nomadik: fix clocksource warning"
 +	at91/dt
 +		git://github.com/at91linux/linux-at91.git tags/at91-dt
 +	vt8500/dt
 +		git://github.com/linux-wmt/linux-vtwm vt8500/dts-3.11
 +	cleanup/dts-cpus
 +		git://linux-arm.org/linux-2.6-lp dts-cpus-updates
 +	patch
 +		"ARM: dts: add missing cpu #address-cell values"
 +	mvebu/dt4
 +		git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-4
 +	renesas/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.11
 +	patches
 +		ARM: socfpga: dts: Add ethernet bindings for SOCFPGA
 +		ARM: socfpga: dts: Add gate-clock bindings
 +	samsung/s3c24xx-dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-dt-1
 +	samsung/exynos-dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-dt-1
 +	mvebu/dt5
 +		git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-5
 +	ux500/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-arm-soc
 +	bcm2835/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.11-dt
 +	tegra/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.11-dt
 +	sunxi/dt
 +		git://github.com/mripard/linux.git tags/sunxi-dt-for-3.11
 +	at91/dt2
 +		git://github.com/at91linux/linux-at91.git tags/at91-dt
 +	zynq/dt
 +		git://git.xilinx.com/linux-xlnx.git tags/zynq-dt-for-3.11
 +	mxs/dt
 +		git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.11
 +	imx/dt
 +		git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.11
 +	sunxi/dt2
 +		git://github.com/mripard/linux.git tags/sunxi-dt-for-3.11-2
 +	nomadik/dt2
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-2
++	samsung/exynos-dt2
++		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-dt-2
++	samsung/s3c24xx-dt2
++		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-dt-2
 +
 +next/drivers
 +	ux500/dma40
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +	timer/dw_apb_timer_of
 +		git://github.com/mmind/linux-rockchip.git tags/dw_apb_timer_of
 +	samsung/s3c24xx-drivers
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-driver-1
 +	omap/gpmc
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +	ux500/clksrc
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-clksrc-for-arm-soc
 +	ux500/dma540_2
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc-2
 +	renesas/rcar-gpio
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-gpio-rcar-for-v3.11
 +		depends on renesas/pinmux-gpio
 +	at91/drivers
 +		git://github.com/at91linux/linux-at91.git tags/at91-drivers
 +	patch
 +		gpio: rcar: fix gpio_rcar_of_table
 +	omap/gpmc2
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-part2-signed
 +	drivers/mailbox
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/mailbox-signed