diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:16:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:16:31 +0200 |
| commit | 6df609b24b23845d2ad85b01814e7ad27f607e92 (patch) | |
| tree | 51ef9acfddff3b967dc95ef558494aa4b7bdc536 /drivers/base | |
| parent | Merge branches 'pm-cpufreq-sched' and 'intel_pstate' (diff) | |
| parent | PM / QoS: return -EINVAL for bogus strings (diff) | |
| parent | Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/... (diff) | |
| download | linux-6df609b24b23845d2ad85b01814e7ad27f607e92.tar.xz linux-6df609b24b23845d2ad85b01814e7ad27f607e92.zip | |
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()