From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 23 Oct 2020 16:11:23 +0000 (+0200)
Subject: Merge branches 'pm-core', 'pm-sleep', 'pm-tools' and 'powercap'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=71d47b53dee0a951417a1bc6d255a45c63cc51b1;p=linux.git

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

71d47b53dee0a951417a1bc6d255a45c63cc51b1