Merge branches 'pm-cpufreq-fixes' and 'pm-tools-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Apr 2017 11:11:09 +0000 (13:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Apr 2017 11:11:09 +0000 (13:11 +0200)
* 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


Trivial merge