From: Kevin Hilman <khilman@linaro.org>
Date: Tue, 10 Dec 2013 17:26:51 +0000 (-0800)
Subject: Merge branch 'next/dt' into for-next
X-Git-Tag: next-20131212~100^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=377bf488a585b590e0d5d8a805caca12e5846453;p=karo-tx-linux.git

Merge branch 'next/dt' into for-next

* next/dt:
  ARM: kirkwood: Add support for NETGEAR ReadyNAS NV+ v2
  ARM: mvebu: Add Netgear ReadyNAS 2120 board
  ARM: mvebu: Fix whitespace in NETGEAR ReadyNAS .dts files
  ARM: mvebu: NETGEAR ReadyNAS 104 .dts cleanup
  ARM: mvebu: NETGEAR ReadyNAS 102 .dts cleanup
  ARM: kirkwood: NETGEAR ReadyNAS Duo v2 .dts cleanup

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

377bf488a585b590e0d5d8a805caca12e5846453
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 81e6e46b84da,000000000000..0b59c50fa1c8
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,39 -1,0 +1,41 @@@
 +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
 +
 +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
 +
 +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		
 +
 +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
 +
 +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