From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 29 Jun 2018 07:54:20 +0000 (+0200)
Subject: Merge branch 'pm-domains'
X-Git-Tag: v4.18-rc3~19^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e27b4d4a7b987ffa93a5a1249dd83dcb69f8d040;p=users%2Fwilly%2Flinux.git

Merge branch 'pm-domains'

Merge fixups for the recent extenstion of the generic power domains
(genpd) framework covering performance states.

* pm-domains:
  PM / Domains: Rename opp_node to np
  PM / Domains: Fix return value of of_genpd_opp_to_performance_state()
---

e27b4d4a7b987ffa93a5a1249dd83dcb69f8d040