From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 2 May 2014 00:41:23 +0000 (+1000)
Subject: Merge remote-tracking branch 'tegra/for-next'
X-Git-Tag: next-20140502~89
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6050a3e09edd6080186f3be2e5ab532c40924e00;p=karo-tx-linux.git

Merge remote-tracking branch 'tegra/for-next'
---

6050a3e09edd6080186f3be2e5ab532c40924e00
diff --cc arch/arm/boot/dts/Makefile
index de67ace5b2dc,d96b2c2ec429..49717b2db19a
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -369,17 -368,11 +369,18 @@@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-har
  	tegra30-cardhu-a02.dtb \
  	tegra30-cardhu-a04.dtb \
  	tegra114-dalmore.dtb \
+ 	tegra124-jetson-tk1.dtb \
  	tegra124-venice2.dtb
 +dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
 +dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 +	ste-hrefprev60-stuib.dtb \
 +	ste-hrefprev60-tvk.dtb \
 +	ste-hrefv60plus-stuib.dtb \
 +	ste-hrefv60plus-tvk.dtb \
 +	ste-ccu8540.dtb \
 +	ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
  	versatile-pb.dtb
 -dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
  	vexpress-v2p-ca9.dtb \
  	vexpress-v2p-ca15-tc1.dtb \