Merge branch 'pm-sleep'
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 18 May 2012 18:46:32 +0000 (20:46 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 18 May 2012 18:46:32 +0000 (20:46 +0200)
commit0033c154a907885c647bc7929fe4bc6bc3b23743
treeb8a1d3b4de6906180c1613c5fb03392a1ef62f07
parent06132ee903e3b0fe3541970e017762a3df3e0551
parent2df83fa4bce421f8176932142f1004adfba0f9dd
Merge branch 'pm-sleep'

* pm-sleep:
  PM / Hibernate: Use get_gendisk to verify partition if resume_file is integer format