tree f3a54c55a37cfa02496de62c0f0b89f2a52dc219
parent 9489e9dcae718d5fde988e4a684a0f55b5f94d17
parent 35546bd477146b75ae2a9ff2cb9bfcdb0f701015
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1354221632 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1354221632 +0100

Merge branch 'pm-qos'

* pm-qos:
  PM / QoS: Handle device PM QoS flags while removing constraints
  PM / QoS: Resume device before exposing/hiding PM QoS flags
  PM / QoS: Document request manipulation requirement for flags
  PM / QoS: Fix a free error in the dev_pm_qos_constraints_destroy()
  PM / QoS: Fix the return value of dev_pm_qos_update_request()
  PM / ACPI: Take device PM QoS flags into account
  PM / Domains: Check device PM QoS flags in pm_genpd_poweroff()
  PM / QoS: Make it possible to expose PM QoS device flags to user space
  PM / QoS: Introduce PM QoS device flags support
  PM / QoS: Prepare struct dev_pm_qos_request for more request types
  PM / QoS: Introduce request and constraint data types for PM QoS flags
  PM / QoS: Prepare device structure for adding more constraint types