From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 24 Sep 2012 11:30:55 +0000 (+0200)
Subject: Merge branch 'pm-runtime'
X-Git-Tag: v3.7-rc1~137^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=071f58279f274f749c4109aef86d899766014139;p=users%2Fhch%2Fmisc.git

Merge branch 'pm-runtime'

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

071f58279f274f749c4109aef86d899766014139