Merge branch 'v3.10/topic/cpufreq' of git://git.linaro.org/kernel/linux-linaro-stable...

diff --cc drivers/cpufreq/cpufreq.c
index 66f6cf5064ece85d201731b58757b594206b2bb7,d444bfe83f133d454e232a2c1c3eb3ceaf05121c..ce94c323fa13dc88f147abd935fba80497b426d6
--- 1/drivers/cpufreq/cpufreq.c
--- 2/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@ -46,8 -48,15 +48,16 @@@ 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