From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 3 Dec 2018 08:57:24 +0000 (+0100)
Subject: Merge branches 'pm-qos' and 'pm-cpufreq' into linux-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3dc82ba79f22ff409e8dde559330aa78b7d9da56;p=users%2Fwilly%2Flinux.git

Merge branches 'pm-qos' and 'pm-cpufreq' into linux-next

* pm-qos:
  PM / QoS: Change to use DEFINE_SHOW_ATTRIBUTE macro

* pm-cpufreq:
  cpufreq: imx6q: save one condition block for normal case of nvmem read
  cpufreq: imx6q: remove unused code
  cpufreq: pmac64: add of_node_put()
  cpufreq: powernv: add of_node_put()
  Documentation: intel_pstate: Clarify coordination of P-State limits
  cpufreq: intel_pstate: Force HWP min perf before offline
  cpufreq: s3c24xx: Change to use DEFINE_SHOW_ATTRIBUTE macro
---

3dc82ba79f22ff409e8dde559330aa78b7d9da56