tree a148f0ff6ee2f5bb6d556ac7a39e30311862eafd
parent 66c44877242d37873df2abb10e4fce26ff4fc9f9
parent d439e64f22ce0eea681ae90c71f584d3a0145ded
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1446421939 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1446421939 +0100

Merge branch 'pm-sleep'

* pm-sleep:
  PM / hibernate: fix a comment typo
  input: i8042: Avoid resetting controller on system suspend/resume
  PM / PCI / ACPI: Kick devices that might have been reset by firmware
  PM / sleep: Add flags to indicate platform firmware involvement
  PM / sleep: Drop pm_request_idle() from pm_generic_complete()
  PCI / PM: Avoid resuming more devices during system suspend
  PM / wakeup: wakeup_source_create: use kstrdup_const
  PM / sleep: Report interrupt that caused system wakeup