summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 15:54:30 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 15:54:30 +0200
commite625ccec1fa6c24620f38fd72d5b2fd62230ad2b (patch)
tree36574c1ee825bbeba99eda67ad8f79a7e9c87adb /drivers
parent56963d99b72ac52bb3185be7fe9832c1715c655a (diff)
parent404c2db635b0e41697eed165b045cb47fd729dd0 (diff)
parent5021282cc483d4126c1704942adb74806f7d15d6 (diff)
downloadlinux-e625ccec1fa6c24620f38fd72d5b2fd62230ad2b.tar.bz2
Merge branches 'pm-tools' and 'powercap'
* pm-tools: tools: cpupower: Fix error when running cpupower monitor tools/power turbostat: fix typo on DRAM column in Joules-mode cpupower: Do not change the frequency of offline cpu tools/power turbostat: fix parameter passing for forked command tools/power turbostat: dump CONFIG_TDP tools/power turbostat: cpu0 is no longer hard-coded, so update output tools/power turbostat: update turbostat(8) * powercap: powercap / RAPL: disable the 2nd power limit properly powercap / RAPL: Add support for Broadwell-H powercap / RAPL: Add support for Skylake H/S