Merge branches 'pm-cpufreq' and 'pm-sleep' containing PM fixes
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Dec 2013 23:42:27 +0000 (00:42 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Dec 2013 23:42:27 +0000 (00:42 +0100)
commit1a6725359ec20e8505312fbf7ed9592ef830b767
tree67bb689911e035ea2d308e091e4b08825eeabb2a
parent413541dd66d51f791a0b169d9b9014e4f56be13c
parenta27a9ab706c8f5bb8bbd320d2e9c5d089e380c6a
parentc606850407d9096415e226c75a871d0650404446
Merge branches 'pm-cpufreq' and 'pm-sleep' containing PM fixes

* pm-cpufreq:
  cpufreq: Use CONFIG_CPU_FREQ_DEFAULT_* to set initial policy for setpolicy drivers
  cpufreq: remove sysfs files for CPUs which failed to come back after resume

* pm-sleep:
  PM / sleep: Fix memory leak in pm_vt_switch_unregister().