From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 3 Jun 2014 21:10:23 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ee7f9d7c7c1d0fde6441be495f6f14eae43af2e0;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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()
---

ee7f9d7c7c1d0fde6441be495f6f14eae43af2e0