tree e47d5f4ae1e8f939b0cde3548987d599181ce529
parent 97b80e685ffae9a6dc946ab08ed32f1eafda97d7
parent 057b0a7518e4b8fca26201715996d6d928a62300
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1401829823 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1401829823 +0200

Merge branch 'pm-sleep'

* pm-sleep:
  PM / hibernate: fixed typo in comment
  PM / sleep: unregister wakeup source when disabling device wakeup
  PM / sleep: Introduce command line argument for sleep state enumeration
  PM / sleep: Use valid_state() for platform-dependent sleep states only
  PM / sleep: Add state field to pm_states[] entries
  PM / sleep: Update device PM documentation to cover direct_complete
  PM / sleep: Mechanism to avoid resuming runtime-suspended devices unnecessarily
  PM / hibernate: Fix memory corruption in resumedelay_setup()
  PM / hibernate: convert simple_strtoul to kstrtoul
  PM / hibernate: Documentation: Fix script for unswapping
  PM / hibernate: no kernel_power_off when pm_power_off NULL
  PM / hibernate: use unsigned local variables in swsusp_show_speed()