Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: Preserve sysfs files across suspend/resume