summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 20:43:44 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 20:43:44 +0100
commit852b7fa228567f397fe5e5a1e060794e0f0125fe (patch)
tree9aa6e1250fac22ea4bdd52cbceb1530df2dd212b /drivers/base
parentcc773e75a0e21deca6f7e6621a1a7bbc3ad92b88 (diff)
parent05a926227742b0bcbef366bbd710c4f6631c7d9f (diff)
parent034e7906211c18c230ef4da43a1c44796dd5b95e (diff)
parentf5261402494a4893e7c5c6cd5ab99b8f7589b717 (diff)
downloadlinux-852b7fa228567f397fe5e5a1e060794e0f0125fe.tar.bz2
Merge branches 'pm-core', 'pm-qos' and 'pm-avs'
* pm-core: PM / core: Fix bug in the error handling of async suspend PM / wakeirq: Fix dedicated wakeirq for drivers not using autosuspend PM / Runtime: Defer resuming of the device in pm_runtime_force_resume() PM / Runtime: Don't allow to suspend a device with an active child net: smsc911x: Synchronize the runtime PM status during system suspend PM / Runtime: Convert pm_runtime_set_suspended() to return an int PM / Runtime: Clarify comment in rpm_resume() when resuming the parent PM / Runtime: Remove the exported function pm_children_suspended() * pm-qos: PM / QoS: Export dev_pm_qos_update_user_latency_tolerance PM / QoS: Fix writing 'auto' to pm_qos_latency_tolerance_us PM / QoS: Improve sysfs pm_qos_latency_tolerance validation * pm-avs: PM / AVS: rockchip-io: make the log more consistent