summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-07-14 13:16:31 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-07-14 13:16:31 +0200
commit6df609b24b23845d2ad85b01814e7ad27f607e92 (patch)
tree51ef9acfddff3b967dc95ef558494aa4b7bdc536 /drivers/base
parenta252c258dd0d95884e71f64877313e3f09d63860 (diff)
parent2ca30331c156ca9e97643ad05dd8930b8fe78b01 (diff)
parent20dd95ef0e1a30e1fc294fa357c3d5cfac735cc8 (diff)
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()