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)
* pm-sleep:
  PM / Hibernate: Use get_gendisk to verify partition if resume_file is integer format


Trivial merge