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

Conflicts:
	drivers/cpuidle/Makefile

diff --cc arch/arm64/boot/dts/rtsm_ve-aemv8a.dts
Simple merge

diff --cc drivers/cpuidle/Makefile
index 7d8256a5ea978688beae9d354d3751336445c740,d3e662cde2245f0e30f61a2184c8b845d95bb624..2d97bcfecd00cfa02f4239960abb5f37e5a6639c
--- 1/drivers/cpuidle/Makefile
--- 2/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@@ -4,6 -4,11 +4,12 @@@
  
  obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
  obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
 +obj-$(CONFIG_BIG_LITTLE) += arm_big_little.o
+ obj-$(CONFIG_OF_IDLE_STATES)            += of_idle_states.o
+ 
  obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
  obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
+ 
+ ###############################################################################
+ # ARM64 drivers
+ obj-$(CONFIG_ARM64_CPUIDLE)           += cpuidle-arm64.o