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/char/tpm/tpmrm-dev.c | |
| parent | a252c258dd0d95884e71f64877313e3f09d63860 (diff) | |
| parent | 2ca30331c156ca9e97643ad05dd8930b8fe78b01 (diff) | |
| parent | 20dd95ef0e1a30e1fc294fa357c3d5cfac735cc8 (diff) | |
| download | linux-6df609b24b23845d2ad85b01814e7ad27f607e92.tar.gz linux-6df609b24b23845d2ad85b01814e7ad27f607e92.tar.bz2 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()