Merge branch 'tracking-armlt-tc2-psci' into lsk-3.10-vexpress

diff --cc arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
Simple merge

diff --cc arch/arm/mach-vexpress/Makefile
index c9ae195cc13842a4ab0325ef6d6e8052fa780e10,59cdec9cbd7e5f86f82649a9b84eab679e7975a7..14193dc7e6e8e6e8a328dd2ed3b689ff035d2e32
--- 1/arch/arm/mach-vexpress/Makefile
--- 2/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@@ -6,9 -6,11 +6,13 @@@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) :
  
  obj-y                                 := v2m.o
  obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)     += ct-ca9x4.o
 +obj-$(CONFIG_ARCH_VEXPRESS_DCSCB)     += dcscb.o      dcscb_setup.o
 +CFLAGS_REMOVE_dcscb.o                 = -pg
  obj-$(CONFIG_ARCH_VEXPRESS_TC2)               += tc2_pm.o tc2_pm_setup.o
  CFLAGS_REMOVE_tc2_pm.o                        = -pg
+ ifeq ($(CONFIG_ARCH_VEXPRESS_TC2),y)
+ obj-$(CONFIG_ARM_PSCI)                        += tc2_pm_psci.o
+ CFLAGS_REMOVE_tc2_pm_psci.o           = -pg
+ endif
  obj-$(CONFIG_SMP)                     += platsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)             += hotplug.o