From: Rafael J. Wysocki <rjw@rjwysocki.net>
Date: Sun, 19 Apr 2015 19:19:27 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq', 'powercap' and 'pm-tools'
X-Git-Tag: firefly_0821_release~176^2~1854^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2363ccb505c15328580d5f64b5e9ea5c1c8a1462;p=firefly-linux-kernel-4.4.55.git

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

2363ccb505c15328580d5f64b5e9ea5c1c8a1462