Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 9 Sep 2016 20:34:16 +0000 (22:34 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 9 Sep 2016 20:34:16 +0000 (22:34 +0200)
commit8a2a835bbcaa6af0ec659606d3eabc23ccaaab80
tree6e45ab8aa86952d3765dea5bb60fddba7a281f21
parentc86d06ba2818c5126078cb0cf4e0175ec381045b
parent3732b30a7d88dc32bef76e117067fb397e811703
Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'

* pm-core-fixes:
  PM / QoS: avoid calling cancel_delayed_work_sync() during early boot

* pm-cpufreq-fixes:
  cpufreq-stats: Minor documentation fix