Merge branches 'pm-opp' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Sep 2017 19:08:07 +0000 (21:08 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Sep 2017 19:08:07 +0000 (21:08 +0200)
commitabeb19a219dce5c021c759d01434f82924354df7
treec59e586bcc612c95209c4dce04611b2a475588b4
parente4d8ae00169f7686e1da5a62e5cf797d12bf8822
parent8aba2333904f9b1c1ea038df261bf7ae8fefb98e
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