From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 15 Aug 2012 19:32:31 +0000 (+0200)
Subject: Merge branch 'pm-runtime-next' into linux-next
X-Git-Tag: next-20120816~34^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b17253b7ba86b4a688ced62d0f02ff5e94ce3107;p=karo-tx-linux.git

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

* pm-runtime-next:
  PM / Runtime: Check device PM QoS setting before "no callbacks" check
  PM / Runtime: Clear power.deferred_resume on success in rpm_suspend()
  PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set
---

b17253b7ba86b4a688ced62d0f02ff5e94ce3107