Merge branch 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Nov 2013 18:26:55 +0000 (19:26 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Nov 2013 18:26:55 +0000 (19:26 +0100)
commitfeba070dbac6f7b477570e590a7dc960b7b0f784
tree44e25aa2755ca2e54624e6ff20155a237451d688
parent15d4cb9013ab7cdf10760aeabd07b007d635b321
parentfd432b9f8c7c88428a4635b9f5a9c6e174df6e36
Merge branch 'pm-sleep'

* pm-sleep:
  PM / hibernate: Avoid overflow in hibernate_preallocate_memory()