Merge branch 'pm-sleep'

* pm-sleep:
  PM / Hibernate: Do not crash kernel in free_basic_memory_bitmaps()

diff --cc kernel/power/snapshot.c
Simple merge

diff --cc kernel/power/user.c
Simple merge