Merge branch 'pm-assorted' into pm-test

Merge branch 'pm-assorted' into pm-test

* pm-assorted:
  PM / Hibernate: Fix typo in a kerneldoc comment
  PM / Hibernate: Freeze kernel threads after preallocating memory
  PM: Update the policy on default wakeup settings
  PM / VT: Cleanup #if defined uglyness and fix compile error
  PM / Suspend: Off by one in pm_suspend()
  PM / Hibernate: Include storage keys in hibernation image on s390
  PM: Fix build issue in main.c for CONFIG_PM_SLEEP unset
  PM / Suspend: Add statistics debugfs file for suspend to RAM

Conflicts:
	kernel/power/Makefile