]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db06391 aa9c9b3 d298787 79d6c40 f8fee6e)
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)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.