From: Kevin Hilman <khilman@linaro.org>
Date: Thu, 19 Dec 2013 15:27:50 +0000 (-0800)
Subject: Merge branch 'next/dt' into for-next
X-Git-Tag: next-20131220~110^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=29b3e60528de52bcc479edce98dceda5c45f8954;p=karo-tx-linux.git

Merge branch 'next/dt' into for-next

* next/dt:
  ARM: nomadik: get rid of explicit ethernet GPIO management
  ARM: nomadik: Remove '0x's from nomadik stn8815 DTS file

Signed-off-by: Kevin Hilman <khilman@linaro.org>
---

29b3e60528de52bcc479edce98dceda5c45f8954
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 3a50bb9969c5,000000000000..c45bd01a47fa
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,64 -1,0 +1,66 @@@
 +Contents of arm-soc branches contained in for-next
 +
 +
 +next/cleanup
 +	renesas/cleanup
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.14
 +	mvebu/soc
 +		git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-3.14
 +	at91/sama5-ccf
 +		git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +	patches
 +		ARM: at91: remove redundant dependency
 +		ARM: clean up cache handling in platform code
 +		ARM: pxa: Remove unused variables
 +		ARM: pxa: remove IRQF_DISABLED
 +		ARM: mmp: build sram driver alone
 +	patch
 +		ARM: at91: remove AT91_PROGRAMMABLE_CLOCKS configuration option
 +
 +next/soc
 +	patches
 +		ARM: ep93xx: remove deprecated IRQF_DISABLED
 +		ARM: ep93xx: use soc bus
 +	soc/sched_clock
 +		local branch: rebased onto tip/timers-core-for-linus for dependencies
 +	patch
 +		ARM: at91: sama5d3: add support for sama5d36 chip
 +	hi3xxx/soc
 +		local branch: fixed several checkpatch errors; originally from:
 +		git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux.git tags/hisilicon-basic
 +
 +next/dt
 +	ux500/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson tags/ux500-devicetree-v3.14-1
 +	mvebu/dt
 +		git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14
 +	sti/dt
 +		http://git.stlinux.com/devel/kernel/linux-sti.git tags/DT-for-v3.14-part-1
 +	mvebu/dt-2
 +		git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-2		
 +	patch
 +		ARM: at91: sama5d3/dt: add sama5d36ek dts files (based on next/cleanup for dependencies)
 +	at91/dt
 +		git://github.com/at91linux/linux-at91.git tags/at91-dt
 +	integrator/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-v3.14-1
 +	patches
 +		ARM: pxa: add PWM nodes to pxa27x.dtsi
++	nomadik/dt
++		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-v3.14
 +
 +next/boards
 +	renesas/defconfig
 +		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.14
 +	mvebu/defconfig
 +		git://git.infradead.org/linux-mvebu.git tags/mvebu-defconfig-3.14
 +	patch
 +		ARM: multi_v7_defconfig: Fix STi support
 +	omap/board-removal
 +		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/board-removal-safe
 +
 +next/drivers
 +	mvebu/drivers
 +		git://git.infradead.org/linux-mvebu.git tags/mvebu-drivers-3.14
 +	samsung/s3c64xx-dmaengine
 +		git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/s3c64xx-dmaengine