From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 24 Oct 2012 00:40:40 +0000 (+0200)
Subject: Merge branch 'pm-qos-next' into linux-next
X-Git-Tag: next-20121025~36^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fde1e29c619288bda8ba737a585b43693ccbcf86;p=karo-tx-linux.git

Merge branch 'pm-qos-next' into linux-next

* pm-qos-next:
  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
---

fde1e29c619288bda8ba737a585b43693ccbcf86