diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:25:36 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:25:36 +0100 |
commit | 165f5fd04aa898fa7dbe4fbe2819cf80453d3bb9 (patch) | |
tree | 26199a71fd035ca377ba59833c3b83d6812af03e /include/trace/events/power.h | |
parent | Merge branches 'misc' and 'powercap' (diff) | |
parent | PM / QoS: Add type to dev_pm_qos_add_ancestor_request() arguments (diff) | |
parent | PM / domains: Turn latency warning into debug message (diff) | |
parent | PM: Add pm_runtime_suspend|resume_force functions (diff) | |
download | linux-165f5fd04aa898fa7dbe4fbe2819cf80453d3bb9.tar.xz 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