tree 07316934e0f7c92955e8ee219fbb6a1e1fc7fa22
parent c4a3fa261b16858416f1fd7db03a33d7ef5fc0b3
parent 4cca0457686e4ee1677d69469e4ddfd94d389a80
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1492168269 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1492168269 +0200

Merge branches 'pm-cpufreq-fixes' and 'pm-tools-fixes'

* pm-cpufreq-fixes:
  cpufreq: Bring CPUs up even if cpufreq_online() failed

* pm-tools-fixes:
  cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores
  tools/power turbostat: update version number
  tools/power turbostat: fix impossibly large CPU%c1 value
  tools/power turbostat: turbostat.8 add missing column definitions
  tools/power turbostat: update HWP dump to decimal from hex
  tools/power turbostat: enable package THERM_INTERRUPT dump
  tools/power turbostat: show missing Core and GFX power on SKL and KBL
  tools/power turbostat: bugfix: GFXMHz column not changing