summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-02-06 00:34:01 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-02-06 00:34:01 +0100
commit79e2f8dd522873614eb31001745af487451a10de (patch)
tree1f8ac31911832794637336590792b2c8bd46ba0b
parent929823040ab8609e88ae4acf32914dde0d063896 (diff)
parente79aee49bcf9ad005b3f2f4cf68b17dc2c22d9c2 (diff)
parent53af16f79fbc3f06df76f6d82adcd4ed03b3d752 (diff)
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