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

Conflicts:
	arch/arm64/boot/dts/Makefile

diff --cc arch/arm64/boot/dts/Makefile
index 24be4296c14c72f089606bce77bbf261118d0e44,66cf7a328e6531b3f368010d27276ff74a46b82c..675be339c648b5365b163da18de5dc04d795ff18
--- 1/arch/arm64/boot/dts/Makefile
--- 2/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)