]> git.karo-electronics.de Git - linux-beck.git/commit
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)
commit071f58279f274f749c4109aef86d899766014139
tree028e8da9404d88c8deb8d969233f85b2ff883cd0
parentc26d4114aac55b57078caf83e261621d22e4596d
parent6f3c77b040fc24708228607bba504878de5236d1
Merge branch 'pm-runtime'

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