tree 028e8da9404d88c8deb8d969233f85b2ff883cd0
parent c26d4114aac55b57078caf83e261621d22e4596d
parent 6f3c77b040fc24708228607bba504878de5236d1
author Rafael J. Wysocki <rjw@sisk.pl> 1348486255 +0200
committer Rafael J. Wysocki <rjw@sisk.pl> 1348486255 +0200

Merge branch 'pm-runtime'

* pm-runtime:
  PM / Runtime: let rpm_resume() succeed if RPM_ACTIVE, even when disabled, v2