From: Kukjin Kim <kgene.kim@samsung.com>
Date: Wed, 14 May 2014 20:57:54 +0000 (+0900)
Subject: Merge branch 'v3.16-next/soc-exynos' into for-next
X-Git-Tag: next-20140516~104^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8071e23f71dbbb4fde5a87af65750829c60e1894;p=karo-tx-linux.git

Merge branch 'v3.16-next/soc-exynos' into for-next
---

8071e23f71dbbb4fde5a87af65750829c60e1894
diff --cc arch/arm/boot/dts/Makefile
index b20c46233bd9,1585ab4a5f1f..cd399a208ec7
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -72,11 -73,12 +72,13 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
  	exynos5250-arndale.dtb \
  	exynos5250-smdk5250.dtb \
  	exynos5250-snow.dtb \
+ 	exynos5260-xyref5260.dtb \
  	exynos5420-arndale-octa.dtb \
 +	exynos5420-peach-pit.dtb \
  	exynos5420-smdk5420.dtb \
  	exynos5440-sd5v1.dtb \
- 	exynos5440-ssdk5440.dtb
+ 	exynos5440-ssdk5440.dtb \
+ 	exynos5800-peach-pi.dtb
  dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
  	ecx-2000.dtb