Merge branch 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 00:07:08 +0000 (01:07 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 00:07:08 +0000 (01:07 +0100)
commitb38f67c4ae35eb4bcea0bf42a0a18a778a5d04c2
tree16718edcebee40195a12dc01c7037b17c8f619f0
parent9bad5845485ec22b31d4489c3bd6d96d78442437
parent6a0c7cd33075f6b7f1d80145bb19812beb3fc5c9
Merge branch 'pm-sleep'

* pm-sleep:
  PM / Hibernate: Do not crash kernel in free_basic_memory_bitmaps()
kernel/power/snapshot.c
kernel/power/user.c