summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-20 13:25:36 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-20 13:25:36 +0100
commit165f5fd04aa898fa7dbe4fbe2819cf80453d3bb9 (patch)
tree26199a71fd035ca377ba59833c3b83d6812af03e /kernel
parentcb97def86446201d9135090615d8c08f9669d338 (diff)
parent71d821fdaec08afcbfb3cf258c0d64ea0e336ff3 (diff)
parent7d1af287320b41909c070f68ffe1591060a32769 (diff)
parent37f204164dfb0186a0caf20bc3e3120080bcd788 (diff)
downloadlinux-165f5fd04aa898fa7dbe4fbe2819cf80453d3bb9.tar.gz
linux-165f5fd04aa898fa7dbe4fbe2819cf80453d3bb9.tar.bz2
linux-165f5fd04aa898fa7dbe4fbe2819cf80453d3bb9.zip
Merge branches 'pm-qos', 'pm-domains' and 'pm-drivers'
* pm-qos: PM / QoS: Add type to dev_pm_qos_add_ancestor_request() arguments ACPI / LPSS: Support for device latency tolerance PM QoS ACPI / scan: Add bind/unbind callbacks to struct acpi_scan_handler PM / QoS: Introcuce latency tolerance device PM QoS type PM / QoS: Add no_constraints_value field to struct pm_qos_constraints PM / QoS: Rename device resume latency QoS items * pm-domains: PM / domains: Turn latency warning into debug message * pm-drivers: PM: Add pm_runtime_suspend|resume_force functions PM / runtime: Fetch runtime PM callbacks using a macro