]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-qos', 'pm-domains' and 'pm-drivers'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Mar 2014 12:25:36 +0000 (13:25 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Mar 2014 12:25:36 +0000 (13:25 +0100)
commitf12ba9295d9834ce5ff4e5513f698d12eb92b455
tree26199a71fd035ca377ba59833c3b83d6812af03e
parent9c35df4a7170a6bdce486cf8b89eb9c2c8076208
parentdc84b6c592b8bae0543fefd1cfa9fc21a13e13e4
parent3a400c832858444f68ee97b3c3f0f6245983be10
parentb6fe1f52c3bc430c06a8aa255b847aca5e9f0e86
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
drivers/acpi/acpi_lpss.c
drivers/acpi/scan.c
include/acpi/acpi_bus.h
include/trace/events/power.h