Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: Fix cpufreq regression after suspend/resume