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)
* 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


Trivial merge