aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-28 21:08:07 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-28 21:08:07 +0200
commitabeb19a219dce5c021c759d01434f82924354df7 (patch)
treec59e586bcc612c95209c4dce04611b2a475588b4 /Documentation
parentPM / OPP: Call notifier without holding opp_table->lock (diff)
parentcpufreq: docs: Drop intel-pstate.txt from index.txt (diff)
downloadlinux-dev-abeb19a219dce5c021c759d01434f82924354df7.tar.xz
linux-dev-abeb19a219dce5c021c759d01434f82924354df7.zip
Merge branches 'pm-opp' and 'pm-cpufreq'
* pm-opp: PM / OPP: Call notifier without holding opp_table->lock * pm-cpufreq: cpufreq: docs: Drop intel-pstate.txt from index.txt cpufreq: dt: Fix sysfs duplicate filename creation for platform-device
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cpu-freq/index.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/cpu-freq/index.txt b/Documentation/cpu-freq/index.txt
index 03a7cee6ac73..c15e75386a05 100644
--- a/Documentation/cpu-freq/index.txt
+++ b/Documentation/cpu-freq/index.txt
@@ -32,8 +32,6 @@ cpufreq-stats.txt - General description of sysfs cpufreq stats.
index.txt - File index, Mailing list and Links (this document)
-intel-pstate.txt - Intel pstate cpufreq driver specific file.
-
pcc-cpufreq.txt - PCC cpufreq driver specific file.