]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* pm-core-fixes:
  PM / QoS: avoid calling cancel_delayed_work_sync() during early boot

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


Trivial merge