tree 1f8ac31911832794637336590792b2c8bd46ba0b
parent 929823040ab8609e88ae4acf32914dde0d063896
parent e79aee49bcf9ad005b3f2f4cf68b17dc2c22d9c2
parent 53af16f79fbc3f06df76f6d82adcd4ed03b3d752
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1454715241 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1454715241 +0100

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