Merge branches 'pm-devfreq' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 9 Oct 2015 20:13:30 +0000 (22:13 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 9 Oct 2015 20:13:30 +0000 (22:13 +0200)
commit670aee3fc7ac37ae947f8b582d87b51d5fa36524
tree9885998483d4506208e5aef9c13c8a86adea20bb
parentd61e87ac53292a3138b4354b687558973686b6ca
parent55582bccdc1e89ecc973c260d46e247df675d4df
Merge branches 'pm-devfreq' and 'pm-cpufreq'

* pm-devfreq:
  PM / devfreq: fix double kfree
  PM / devfreq: Fix governor_store()

* pm-cpufreq:
  cpufreq: prevent lockup on reading scaling_available_frequencies
  cpufreq: acpi_cpufreq: prevent crash on reading freqdomain_cpus