]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-devfreq', 'powercap' and 'pm-docs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 30 Mar 2020 12:48:31 +0000 (14:48 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 30 Mar 2020 12:48:31 +0000 (14:48 +0200)
commite7636d064aab606f01cca8d16be2ff88c3941dfc
treefd5e5851599aeb1c0707540f919a476848e21e0b
parenta576acd9bff66f8aed0626dcd6b05e558d719993
parent2db8c559327217b298ab76b2ebdd33691c3d19e0
parent80e8c6114b8b22fa1eb2266c0e1e9d1f2dfa4a4d
parent1e3867c609725b499ce7b858dee01554497ef890
Merge branches 'pm-devfreq', 'powercap' and 'pm-docs'

* pm-devfreq:
  PM / devfreq: Get rid of some doc warnings
  PM / devfreq: Fix handling dev_pm_qos_remove_request result
  PM / devfreq: Fix a typo in a comment
  PM / devfreq: Change to DEVFREQ_GOV_UPDATE_INTERVAL event name
  PM / devfreq: Remove unneeded extern keyword
  PM / devfreq: Use constant name of userspace governor

* powercap:
  powercap: idle_inject: Replace zero-length array with flexible-array member

* pm-docs:
  docs: cpu-freq: convert cpufreq-stats.txt to ReST
  docs: cpu-freq: convert cpu-drivers.txt to ReST
  docs: cpu-freq: convert core.txt to ReST
  docs: cpu-freq: convert index.txt to ReST
  docs: cpufreq: fix a broken reference
  Documentation: cpufreq: Move legacy driver documentation