]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-sleep-next' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 23 Aug 2012 00:48:30 +0000 (02:48 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 23 Aug 2012 00:48:30 +0000 (02:48 +0200)
* pm-sleep-next:
  PM / Freezer: Fix small typo "regrigerator"
  PM / Sleep: Print name of wakeup source that aborts suspend


Trivial merge