diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-22 22:45:28 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-22 22:45:28 +0200 |
| commit | 1419d033170e4c21e0722306b1c9fdc6794f309c (patch) | |
| tree | 0ac82ce6ea7c9ee4ddeedacb1fd0106c9c458a48 | |
| parent | 157c460e10cb6eca29ccbd0f023db159d0c55ec7 (diff) | |
| parent | 41ba8bd0829f5c210715ece8b0f699bed0da8eb5 (diff) | |
| parent | b247c211ee367cfe975dd54e381094083adfd8d3 (diff) | |
| download | linux-1419d033170e4c21e0722306b1c9fdc6794f309c.tar.bz2 | |
Merge branches 'pm-core', 'pm-qos' and 'pm-docs'
* pm-core:
PM: core: Fix device_pm_check_callbacks()
* pm-qos:
PM / QoS: Use the correct variable to check the QoS request type
* pm-docs:
PM: docs: Drop an excess character from devices.rst
driver core: Fix link to device power management documentation