]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-cpufreq', 'powercap' and 'pm-tools'
authorRafael J. Wysocki <rjw@rjwysocki.net>
Sun, 19 Apr 2015 19:19:27 +0000 (21:19 +0200)
committerRafael J. Wysocki <rjw@rjwysocki.net>
Sun, 19 Apr 2015 19:19:27 +0000 (21:19 +0200)
commitb3f984623df7f291fe5c04c4504fbbe32d57f58d
tree56fe96a7aef145e1eba9b70164578dee4e0095a3
parent56bbbd0547be5c9b4d228bd08d1d19453fd51beb
parentd3cdd7cf4f8434a9875e32b78628dc5ec596b4dc
parentf6b9be8ea335363461a5f5946904c6f0ef9d98b6
parentaa0120175796ea980c6a69bfbe833ecc22fcc3a7
Merge branches 'pm-cpufreq', 'powercap' and 'pm-tools'

* pm-cpufreq:
  cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
  intel_pstate: Change the setpoint for Atom params

* powercap:
  powercap / RAPL: Add support for Intel Skylake processors

* pm-tools:
  cpupower: fix breakage from libpci API change