Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'

8a2a835b · Rafael J. Wysocki <[email protected]> · 2016-09-09 22:34:16 +02:00

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

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

Merge commit. Changes below are compared with the first parent: c86d06ba.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
Documentation/cpu-freq/cpufreq-stats.txt	modified	+1	−1	View file

diff --git a/Documentation/cpu-freq/cpufreq-stats.txt b/Documentation/cpu-freq/cpufreq-stats.txt
index fc64749..8d9773f 100644
--- a/Documentation/cpu-freq/cpufreq-stats.txt
+++ b/Documentation/cpu-freq/cpufreq-stats.txt
@@ -103,7 +103,7 @@ Config Main Menu
 	Power management options (ACPI, APM)  --->
 		CPU Frequency scaling  --->
 			[*] CPU Frequency scaling
-			<*>   CPU frequency translation statistics 
+			[*]   CPU frequency translation statistics
 			[*]     CPU frequency translation statistics details
 
 