From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 14 Jul 2017 11:16:31 +0000 (+0200)
Subject: Merge branches 'pm-qos' and 'pm-devfreq'
X-Git-Tag: v4.13-rc1~17^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=6df609b24b23845d2ad85b01814e7ad27f607e92

Merge branches 'pm-qos' and 'pm-devfreq'

* pm-qos:
  PM / QoS: return -EINVAL for bogus strings

* pm-devfreq:
  PM / devfreq: constify attribute_group structures.
  PM / devfreq: tegra: fix error return code in tegra_devfreq_probe()
  PM / devfreq: rk3399_dmc: fix error return code in rk3399_dmcfreq_probe()
---

6df609b24b23845d2ad85b01814e7ad27f607e92