Merge branch 'pm-sleep' into linux-next

Merge branch 'pm-sleep' into linux-next

* pm-sleep: (42 commits)
  PM / Sleep: Recommend [un]lock_system_sleep() over using pm_mutex directly
  PM / Sleep: Replace mutex_[un]lock(&pm_mutex) with [un]lock_system_sleep()
  PM / Sleep: Make [un]lock_system_sleep() generic
  PM / Sleep: Use the freezer_count() functions in [un]lock_system_sleep() APIs
  PM / Freezer: Remove the "userspace only" constraint from freezer[_do_not]_count()
  PM / Hibernate: Replace unintuitive 'if' condition in kernel/power/user.c with 'else'
  Freezer / sunrpc / NFS: don't allow TASK_KILLABLE sleeps to block the freezer
  PM / Sleep: Unify diagnostic messages from device suspend/resume
  ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR
  PM / Hibernate: Remove deprecated hibernation test modes
  PM / Hibernate: Thaw processes in SNAPSHOT_CREATE_IMAGE ioctl test path
  PM / Hibernate: Enable usermodehelpers in software_resume() error path
  Freezer: fix more fallout from the thaw_process rename
  PM / Hibernate: Refactor and simplify hibernation_snapshot() code
  PM / Sleep: Simplify device_suspend_noirq()
  PM / Sleep: Remove unnecessary label and jumps to it form PM core code
  PM / Memory-hotplug: Avoid task freezing failures
  PM: Fix indentation and remove extraneous whitespaces in kernel/power/main.c
  freezer: fix wait_event_freezable/__thaw_task races
  freezer: kill unused set_freezable_with_signal()
  ...

Conflicts:
	kernel/cgroup_freezer.c