]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-runtime-next' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 15 Aug 2012 19:32:31 +0000 (21:32 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 15 Aug 2012 19:32:31 +0000 (21:32 +0200)
commitb17253b7ba86b4a688ced62d0f02ff5e94ce3107
tree43c29b3e69495b715fe3a69e09f7b2ab9cb40bad
parent92444dd003d626863aad9a7b842ea54549c31912
parente2ee0e383031217ff7b840014d55d66ff25f1662
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