summaryrefslogtreecommitdiffstats
path: root/tools
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 /tools
parent0f5abd4020bfd2b1eec6975b91bd5068aa674a93 (diff)
parent64df1fdfccc054a4e5480c6bc965b67d3c83c3ae (diff)
parent5fa0fa4b01cd9c52c4be0ff69ce0d922cd724812 (diff)
parent06b230e3dd46e3e45fb57990b09007c7cd071515 (diff)
downloadlinux-2363ccb505c15328580d5f64b5e9ea5c1c8a1462.tar.gz
linux-2363ccb505c15328580d5f64b5e9ea5c1c8a1462.tar.bz2
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