From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 1 Sep 2015 13:54:30 +0000 (+0200)
Subject: Merge branches 'pm-tools' and 'powercap'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e625ccec1fa6c24620f38fd72d5b2fd62230ad2b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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
---

e625ccec1fa6c24620f38fd72d5b2fd62230ad2b