Merge branch 'pm-runtime' into pm-for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 16 Oct 2011 21:26:49 +0000 (23:26 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 16 Oct 2011 21:26:49 +0000 (23:26 +0200)
commit9bd717c0dc8224cadfd66df7eeff98c987711d98
treebca8a9232d457d984d87da53b5ffadcb7dcd46be
parent7811ac276bb9f77aa6475110ef340c1bc3090def
parent857b36c7b038ac56a882ee914df93e5985443074
Merge branch 'pm-runtime' into pm-for-linus

* pm-runtime:
  PM / Runtime: Handle .runtime_suspend() failure correctly
  PM / Runtime: Fix kerneldoc comment for rpm_suspend()
  PM / Runtime: Update document about callbacks
Documentation/power/runtime_pm.txt