]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'pm-core' and 'pm-domains'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Feb 2016 23:34:01 +0000 (00:34 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Feb 2016 23:34:01 +0000 (00:34 +0100)
* 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


Trivial merge