]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92444dd e2ee0e3)
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)
* 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


Trivial merge
Linux kernel for KaRo TX COM modules