From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 1 Nov 2015 23:52:19 +0000 (+0100)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: firefly_0821_release~176^2~812^2~4
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=9bb4064ca3bd771f8df88529a3578f9bb5243911

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

9bb4064ca3bd771f8df88529a3578f9bb5243911