From: Mark Brown <broonie@linaro.org>
Date: Fri, 30 May 2014 10:14:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~116^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6fe70bb73ef2fa814d88220c38f2ca07342aea75;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/cpuidle/Makefile
---

6fe70bb73ef2fa814d88220c38f2ca07342aea75
diff --cc drivers/cpuidle/Makefile
index 7d8256a5ea97,d3e662cde224..2d97bcfecd00
--- a/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