Merge branch 'next/dt' into for-next

* next/dt:
  ARM: shmobile: Add r8a7790 CA7 CPU cores to DTSI
  ARM: shmobile: Add r8a7790 CA15 CPU cores
  ARM: shmobile: ape6evm-reference: add MMCIF and SDHI DT nodes

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 7f2192caa65d47b52f8d676aafa566dbd10de272,0000000000000000000000000000000000000000..efb84840db241e3a565667f3804bb46e85727eac
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,43 -1,0 +1,45 @@@
 +
 +
 +next/cleanup
 +      shark/removal
 +                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/del-shark-for-v3.13
 +      cleanup/dt-clock
 +              https://github.com/shesselba/linux-dove.git clk-of-init-v2_for-3.13
 +      patch
 +              ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP
 +      reneasas/initdata-cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12
 +      renesas/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.13
 +
 +next/soc
 +      samsung/s3c64xx-clk
 +              http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-clk-s3c64xx
 +      patch
 +              ARM: davinci: remove deprecated IRQF_DISABLED
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.13
 +      renesas/smp
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-smp-for-v3.13
 +
 +next/drivers
 +      davinci/gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio
 +
 +next/boards
 +      renesas/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards-for-v3.13
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.13
 +
 +next/dt
 +      samsung/s3c64xx-dt
 +                http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-s3c64xx
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-v3.13-2
 +              patch "ARM: ux500: enable appended dtb in u8500_defconfig"
 +      ux500/dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-devicetree-2
++      renesas/dt
++              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.13
 +

diff --cc arch/arm/boot/dts/r8a7790.dtsi
Simple merge