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
mariux64 · Sep 9, 2016 · 8a2a835 · 8a2a835
2 parents c86d06b + 3732b30
commit 8a2a835
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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