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)
commit2363ccb505c15328580d5f64b5e9ea5c1c8a1462
tree56fe96a7aef145e1eba9b70164578dee4e0095a3
parent0f5abd4020bfd2b1eec6975b91bd5068aa674a93
parent64df1fdfccc054a4e5480c6bc965b67d3c83c3ae
parent5fa0fa4b01cd9c52c4be0ff69ce0d922cd724812
parent06b230e3dd46e3e45fb57990b09007c7cd071515
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