tree 36574c1ee825bbeba99eda67ad8f79a7e9c87adb
parent 56963d99b72ac52bb3185be7fe9832c1715c655a
parent 404c2db635b0e41697eed165b045cb47fd729dd0
parent 5021282cc483d4126c1704942adb74806f7d15d6
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1441115670 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1441115670 +0200

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