]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-sleep-next' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 19 Sep 2012 12:17:48 +0000 (14:17 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 19 Sep 2012 12:17:48 +0000 (14:17 +0200)
* pm-sleep-next:
  PM / Sleep: use resume event when call dpm_resume_early

1  2 
drivers/base/power/main.c

Simple merge