From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 05:19:39 +0000 (+1100)
Subject: Merge remote-tracking branch 'renesas/next'
X-Git-Tag: next-20130220~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=987079d86356c6f1e5233bb88a46e3afcacbff27;p=karo-tx-linux.git

Merge remote-tracking branch 'renesas/next'
---

987079d86356c6f1e5233bb88a46e3afcacbff27
diff --cc arch/arm/boot/dts/Makefile
index 9c6255884cbb,b284b2225ae0..ee9fbe4d9912
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -136,10 -122,10 +136,12 @@@ dtb-$(CONFIG_ARCH_U8500) += snowball.dt
  	ccu9540.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
  	r8a7740-armadillo800eva.dtb \
+ 	r8a7779-marzen-reference.dtb \
  	sh73a0-kzm9g.dtb \
+ 	sh73a0-kzm9g-reference.dtb \
  	sh7372-mackerel.dtb
 +dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
 +	socfpga_vt.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
  	spear1340-evb.dtb
  dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \