From: Simon Horman <horms+renesas@verge.net.au>
Date: Tue, 24 Dec 2013 14:09:51 +0000 (+0900)
Subject: Merge branch 'heads/dt3' into devel
X-Git-Tag: next-20140106~106^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a25a785d663baab1e44a9060e131b1e3d433ab79;p=karo-tx-linux.git

Merge branch 'heads/dt3' into devel
---

a25a785d663baab1e44a9060e131b1e3d433ab79
diff --cc arch/arm/boot/dts/Makefile
index 00aa1442735a,5839077fac91..ee0f2bd6a310
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -226,8 -225,8 +226,7 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += e
  	r8a7779-marzen.dtb \
  	r8a7779-marzen-reference.dtb \
  	r8a7791-koelsch.dtb \
- 	r8a7791-koelsch-reference.dtb \
  	r8a7790-lager.dtb \
 -	r8a7790-lager-reference.dtb \
  	sh73a0-kzm9g.dtb \
  	sh73a0-kzm9g-reference.dtb \
  	r8a73a4-ape6evm.dtb \