summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@rjwysocki.net>2015-04-19 21:19:27 +0200
committerRafael J. Wysocki <rjw@rjwysocki.net>2015-04-19 21:19:27 +0200
commit2363ccb505c15328580d5f64b5e9ea5c1c8a1462 (patch)
tree56fe96a7aef145e1eba9b70164578dee4e0095a3
parentMerge tag 'acpica-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff)
parentcpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning (diff)
parentpowercap / RAPL: Add support for Intel Skylake processors (diff)
parentcpupower: fix breakage from libpci API change (diff)
downloadlinux-2363ccb505c15328580d5f64b5e9ea5c1c8a1462.tar.xz
linux-2363ccb505c15328580d5f64b5e9ea5c1c8a1462.zip
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