From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 15 Feb 2013 12:58:54 +0000 (+0100)
Subject: Merge branch 'pm-assorted'
X-Git-Tag: firefly_0821_release~3680^2~1099^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7113fe74c10bc01abfdad2fe1f9ca023b0f83685;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-assorted'

* pm-assorted:
  suspend: enable freeze timeout configuration through sys
  ACPI: enable ACPI SCI during suspend
  PM: Introduce suspend state PM_SUSPEND_FREEZE
  PM / Runtime: Add new helper function: pm_runtime_active()
  PM / tracing: remove deprecated power trace API
  PM: don't use [delayed_]work_pending()
  PM / Domains: don't use [delayed_]work_pending()
---

7113fe74c10bc01abfdad2fe1f9ca023b0f83685