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

diff --cc drivers/cpufreq/cpufreq.c
index df9a2427c233c14184b5e20ed5a8cb5b06390da9,2d53f47d1747360b8968c7c308c0f975777ef9ab..66f6cf5064ece85d201731b58757b594206b2bb7
--- 1/drivers/cpufreq/cpufreq.c
--- 2/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@ -48,16 -46,7 +46,8 @@@ static DEFINE_PER_CPU(struct cpufreq_po
  static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor);
  #endif
  static DEFINE_RWLOCK(cpufreq_driver_lock);
 +static DEFINE_MUTEX(cpufreq_governor_lock);
  
- /* Flag to suspend/resume CPUFreq governors */
- static bool cpufreq_suspended;
- 
- static inline bool has_target(void)
- {
-       return cpufreq_driver->target;
- }
- 
  /*
   * cpu_policy_rwsem is a per CPU reader-writer semaphore designed to cure
   * all cpufreq/hotplug/workqueue/etc related lock issues.

diff --cc include/linux/cpufreq.h
Simple merge