summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-22 22:45:28 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-22 22:45:28 +0200
commit1419d033170e4c21e0722306b1c9fdc6794f309c (patch)
tree0ac82ce6ea7c9ee4ddeedacb1fd0106c9c458a48
parent157c460e10cb6eca29ccbd0f023db159d0c55ec7 (diff)
parent41ba8bd0829f5c210715ece8b0f699bed0da8eb5 (diff)
parentb247c211ee367cfe975dd54e381094083adfd8d3 (diff)
downloadlinux-1419d033170e4c21e0722306b1c9fdc6794f309c.tar.gz
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