diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-02-06 00:34:01 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-02-06 00:34:01 +0100 |
commit | 79e2f8dd522873614eb31001745af487451a10de (patch) | |
tree | 1f8ac31911832794637336590792b2c8bd46ba0b | |
parent | Merge branches 'pnp' and 'acpi-cppc' (diff) | |
parent | PM: Avoid false-positive warnings in dev_pm_domain_set() (diff) | |
parent | PM / Domains: Silence compiler warning for an unused function (diff) | |
download | linux-dev-79e2f8dd522873614eb31001745af487451a10de.tar.xz linux-dev-79e2f8dd522873614eb31001745af487451a10de.zip |
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