]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit9d1d5518366a26faadbb784dba51b6f15c131fae
treedc0a1cc7f75c9860780b32d5d59dbdc65be42b75
parent7b62609f4037c28789017cc9c34b94f613fd5619
parent1eac8111e0763853266a171ce11214da3a347a0a
Merge branch 'pm-sleep' into linux-next

* pm-sleep:
  PM / Sleep: Merge internal functions in generic_ops.c
  PM / Sleep: Simplify generic system suspend callbacks