Merge branch 'pm-freezer' into pm-sleep
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 8 Dec 2011 22:21:25 +0000 (23:21 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 8 Dec 2011 22:21:25 +0000 (23:21 +0100)
commit43753e58b16506f47bc2901e6a228445960b6ce7
treeae00dbd77a3a9efbc9df8a6742caac693d3bd9df
parente5b16746f0f2d6883c226af52d90904ce0f7eee8
parent467de1fc67d1bd2954eaac7019c564f28fa2b6a5
Merge branch 'pm-freezer' into pm-sleep

* pm-freezer:
  PM / Freezer: Remove the "userspace only" constraint from freezer[_do_not]_count()