Merge branch 'pm-cpufreq-next' into linux-next

* pm-cpufreq-next:
  cpufreq: conservative: Fix relation when decreasing frequency
  cpufreq: conservative: Break out earlier on the lowest frequency
  cpufreq: Convert the cpufreq_driver_lock to a rwlock