From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Fri, 18 May 2012 18:46:32 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: firefly_0821_release~3680^2~2794^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0033c154a907885c647bc7929fe4bc6bc3b23743;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-sleep'

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

0033c154a907885c647bc7929fe4bc6bc3b23743