summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-09-09 14:47:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-09 14:47:41 -0700
commitdaf6b9b68fca57effe3fcf74a8528f17516c420f (patch)
treebd9d1c30fc943bfdc712d89de3081384b22115f4 /Documentation
parentc4a6c70f93638821519047ba751b0145f7a9f90b (diff)
parent8a2a835bbcaa6af0ec659606d3eabc23ccaaab80 (diff)
downloadlinux-daf6b9b68fca57effe3fcf74a8528f17516c420f.tar.bz2
Merge tag 'pm-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: "This includes a PM QoS framework fix from Tejun to prevent interrupts from being enabled unexpectedly during early boot and a cpufreq documentation fix. Specifics: - If the PM QoS framework invokes cancel_delayed_work_sync() during early boot, it will enable interrupts which is not expected at that point, so prevent it from happening (Tejun Heo) - Fix cpufreq statistic documentation to follow a recent change in behavior that forgot to update it as appropriate (Jean Delvare)" * tag 'pm-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq-stats: Minor documentation fix PM / QoS: avoid calling cancel_delayed_work_sync() during early boot
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