]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-sleep' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Sat, 17 Dec 2011 23:28:13 +0000 (00:28 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Sat, 17 Dec 2011 23:28:13 +0000 (00:28 +0100)
* pm-sleep:
  PM / Sleep: Merge internal functions in generic_ops.c
  PM / Sleep: Simplify generic system suspend callbacks


Trivial merge