Merge branches 'pm-core', 'pm-sleep', 'pm-tools' and 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 23 Oct 2020 16:11:23 +0000 (18:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 23 Oct 2020 16:11:23 +0000 (18:11 +0200)
commit71d47b53dee0a951417a1bc6d255a45c63cc51b1
tree296896315baa28305ac2c272eccbc94ed42124d2
parentdb06391e05a6beb134ec506a64dedd21328606dc
parentaa9c9b3f3f08cb0fda8a8139e6fb302c9a2e21ed
parentd298787dbbab5f7ada97c292e19c5c6e55fda6cd
parent79d6c4093bb14e5a48b727c1e98f4fc8c8529e8d
parentf8fee6e63e55a7fc0e53a460ae3523d9e4d9bd48
Merge branches 'pm-core', 'pm-sleep', 'pm-tools' and 'powercap'

* pm-core:
  PM: runtime: Fix typo in pm_runtime_set_active() helper comment

* pm-sleep:
  PM: sleep: remove unreachable break

* pm-tools:
  cpupower: speed up generating git version string
  cpupowerutils: fix spelling mistake "dependant" -> "dependent"

* powercap:
  powercap: Fix typo in Kconfig "Plance" -> "Plane"
  powercap/intel_rapl: enumerate Psys RAPL domain together with package RAPL domain
  powercap/intel_rapl: Fix domain detection