From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 25 Oct 2012 23:52:38 +0000 (+0200)
Subject: Merge branch 'pm-qos-next' into linux-next
X-Git-Tag: next-20121029~40^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ba437a4eec080accfaac0a048b4ea183fe11848;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
---

5ba437a4eec080accfaac0a048b4ea183fe11848