From: Mark Brown <broonie@linaro.org>
Date: Thu, 8 May 2014 11:11:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/juno' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~134^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8810719ecbb78766c7525c60888057bc6a675787;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/juno' into linux-linaro-lsk

Conflicts:
	arch/arm64/boot/dts/Makefile
---

8810719ecbb78766c7525c60888057bc6a675787
diff --cc arch/arm64/boot/dts/Makefile
index 24be4296c14c,66cf7a328e65..675be339c648
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -1,5 -1,5 +1,6 @@@
 -dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
 +dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb \
 +				fvp-base-gicv2-psci.dtb
+ dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb
  
  targets += dtbs
  targets += $(dtb-y)