]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8a925a555833e619fa1ffc166aabd6e78204a04a
tree296896315baa28305ac2c272eccbc94ed42124d2
parent61f4077eb5fdb5672b9bf0d9019dd4bd28ce6301
parent6c2ec937d213a374e45cdc9c120f48113976c9ad
parentfe250ded8174b6676e14692cea0b273f9f24f7bd
parent1a64a2f4bda3c210d21d666e4239e0d13f86a2fa
parent7313a28b5c5bc73fd8d66fc4c544222475cf14d2
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