From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 5 Feb 2016 23:34:01 +0000 (+0100)
Subject: Merge branches 'pm-core' and 'pm-domains'
X-Git-Tag: Ubuntu-4.8.0-22.24~1912^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=79e2f8dd522873614eb31001745af487451a10de;p=mirror_ubuntu-zesty-kernel.git

Merge branches 'pm-core' and 'pm-domains'

* pm-core:
  PM: Avoid false-positive warnings in dev_pm_domain_set()
  ACPI / LPSS: set PM domain via helper setter

* pm-domains:
  PM / Domains: Silence compiler warning for an unused function
---

79e2f8dd522873614eb31001745af487451a10de