From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Jan 2018 01:56:04 +0000 (+0100)
Subject: Merge branches 'pm-opp', 'pm-devfreq', 'pm-avs' and 'pm-tools'
X-Git-Tag: v4.16-rc1~196^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ee43730d65155c5b3c3d0531f11daf59f8f42a73;p=linux.git

Merge branches 'pm-opp', 'pm-devfreq', 'pm-avs' and 'pm-tools'

* pm-opp:
  OPP: Introduce "required-opp" property
  OPP: Allow OPP table to be used for power-domains

* pm-devfreq:
  PM / devfreq: Fix potential NULL pointer dereference in governor_store
  PM / devfreq: Propagate error from devfreq_add_device()

* pm-avs:
  PM / AVS: rockchip-io: account for const type of of_device_id.data

* pm-tools:
  tools/power/x86/intel_pstate_tracer: Free the trace buffer memory
  cpupower: Remove FSF address
---

ee43730d65155c5b3c3d0531f11daf59f8f42a73