summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-09-09 23:34:16 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-09-09 23:34:16 +0300
commit8a2a835bbcaa6af0ec659606d3eabc23ccaaab80 (patch)
tree6e45ab8aa86952d3765dea5bb60fddba7a281f21 /Documentation
parentc86d06ba2818c5126078cb0cf4e0175ec381045b (diff)
parent3732b30a7d88dc32bef76e117067fb397e811703 (diff)
downloadlinux-8a2a835bbcaa6af0ec659606d3eabc23ccaaab80.tar.xz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cpu-freq/cpufreq-stats.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/cpu-freq/cpufreq-stats.txt b/Documentation/cpu-freq/cpufreq-stats.txt
index fc647492e940..8d9773f23550 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