]> 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, 15 Aug 2012 19:00:40 +0000 (21:00 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 15 Aug 2012 19:00:40 +0000 (21:00 +0200)
* pm-sleep-next:
  PM / Sleep: Print name of wakeup source that aborts suspend


Trivial merge