From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 10 Feb 2015 15:09:52 +0000 (+0100)
Subject: Merge branches 'pm-sleep' and 'pm-runtime'
X-Git-Tag: firefly_0821_release~176^2~2381^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f52386892fb17b4a70a7a73240c0f04a0a6011a6;p=firefly-linux-kernel-4.4.55.git

Merge branches 'pm-sleep' and 'pm-runtime'

* pm-sleep:
  PM / hibernate: exclude freed pages from allocated pages printout
  PM / sleep: export suspend_resume trace event
  PM / sleep: Mention async suspend in PM_TRACE documentation
  PM / hibernate: Remove unused function

* pm-runtime:
  ACPI / PM: Remove unneeded nested #ifdef
  USB / PM: Remove unneeded #ifdef and associated dead code
---

f52386892fb17b4a70a7a73240c0f04a0a6011a6