From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 30 Mar 2020 12:48:31 +0000 (+0200)
Subject: Merge branches 'pm-devfreq', 'powercap' and 'pm-docs'
X-Git-Tag: v5.10.7~2987^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2409000a0cad2242fd4e2578f761f97069625478;p=platform%2Fkernel%2Flinux-rpi.git

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
---

2409000a0cad2242fd4e2578f761f97069625478