Merge branch 'heads/dt3' into devel

diff --cc arch/arm/boot/dts/Makefile
index 00aa1442735a782d950542660fdcf31e70b669c4,5839077fac912708d12dd3360d62030b7f434e44..ee0f2bd6a310ed6cf43890bdfbd7368b42b21da3
--- 1/arch/arm/boot/dts/Makefile
--- 2/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 \

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