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
This commit is contained in:
Rafael J. Wysocki 2016-09-09 22:34:16 +02:00
commit 8a2a835bbc