From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 4 Mar 2019 10:18:42 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'powercap'
X-Git-Tag: v5.15~6891^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08a2e45ac0253d4e833661979e777caa82c84e56;p=platform%2Fkernel%2Flinux-starfive.git

Merge branches 'pm-cpuidle' and 'powercap'

* pm-cpuidle:
  ACPI / processor: Set P_LVL{2,3} idle state descriptions
  intel_idle: add support for Jacobsville
  cpuidle: dt: bail out if the idle-state DT node is not compatible
  cpuidle: use BIT() for idle state flags and remove CPUIDLE_DRIVER_FLAGS_MASK
  Documentation: driver-api: PM: Add cpuidle document
  cpuidle: New timer events oriented governor for tickless systems

* powercap:
  powercap/intel_rapl: add Ice Lake mobile
  powercap: intel_rapl: add support for Jacobsville
---

08a2e45ac0253d4e833661979e777caa82c84e56