]> 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)
commit4e8960c6b58a922e71c7ec63717c2262c04538d6
tree296896315baa28305ac2c272eccbc94ed42124d2
parentdb81507b3c6f438dc3154db31b6cdfa89ab8e327
parente7ba4c7a515a04fc8343e21a46680af7c10d90fa
parentf9fb55503b162522e779b714b2daf74db066512b
parente7d30c884f2851de5f8ae2fb1e2535d5b7f9199f
parent8538762a6f65e92cc8dabebf366bbf852d3265ea
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