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

+1 -1
+1 -1
Documentation/cpu-freq/cpufreq-stats.txt
··· 103 103 Power management options (ACPI, APM) ---> 104 104 CPU Frequency scaling ---> 105 105 [*] CPU Frequency scaling 106 - <*> CPU frequency translation statistics 106 + [*] CPU frequency translation statistics 107 107 [*] CPU frequency translation statistics details 108 108 109 109