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)
* pm-sleep:
  PM / Hibernate: Do not crash kernel in free_basic_memory_bitmaps()

1  2 
kernel/power/snapshot.c
kernel/power/user.c

Simple merge
Simple merge