Merge branches 'pm-qos' and 'pm-devfreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Jul 2017 11:16:31 +0000 (13:16 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Jul 2017 11:16:31 +0000 (13:16 +0200)
commit6df609b24b23845d2ad85b01814e7ad27f607e92
tree51ef9acfddff3b967dc95ef558494aa4b7bdc536
parenta252c258dd0d95884e71f64877313e3f09d63860
parent2ca30331c156ca9e97643ad05dd8930b8fe78b01
parent20dd95ef0e1a30e1fc294fa357c3d5cfac735cc8
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()