Merge branch 'pm-runtime'
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 24 Sep 2012 11:30:55 +0000 (13:30 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 24 Sep 2012 11:30:55 +0000 (13:30 +0200)
* pm-runtime:
  PM / Runtime: let rpm_resume() succeed if RPM_ACTIVE, even when disabled, v2


Trivial merge