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)
* pm-runtime:
  PM / Runtime: Handle .runtime_suspend() failure correctly
  PM / Runtime: Fix kerneldoc comment for rpm_suspend()
  PM / Runtime: Update document about callbacks


Trivial merge