tree 56fe96a7aef145e1eba9b70164578dee4e0095a3
parent 0f5abd4020bfd2b1eec6975b91bd5068aa674a93
parent 64df1fdfccc054a4e5480c6bc965b67d3c83c3ae
parent 5fa0fa4b01cd9c52c4be0ff69ce0d922cd724812
parent 06b230e3dd46e3e45fb57990b09007c7cd071515
author Rafael J. Wysocki <rjw@rjwysocki.net> 1429471167 +0200
committer Rafael J. Wysocki <rjw@rjwysocki.net> 1429471167 +0200

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