summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-07 23:48:14 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-07 23:48:14 +0300
commitd0aee67fa19260d772b07f144cf6c93e63431f67 (patch)
tree3ab24b9981da7a57742c9dce217218d014284c85 /drivers/base
parent3fc7aeeb08bfde59877e7f9a4eea3c5ebcae72be (diff)
parent0294112ee3135fbd15eaa70015af8283642dd970 (diff)
parentd3e13ff3c1aa2403d9a5f371baac088daeb8f56d (diff)
parent93af5e93544328285a6f65f7d47bbea8979b28fb (diff)
parentb51f9b103f58db2c5c0a20d6cee26c8bc255d3ae (diff)
downloadlinux-d0aee67fa19260d772b07f144cf6c93e63431f67.tar.xz
Merge branches 'acpi-pnp', 'acpi-soc', 'pm-domains' and 'pm-sleep'
* acpi-pnp: ACPI / PNP: Reserve ACPI resources at the fs_initcall_sync stage * acpi-soc: ACPI / LPSS: Fix up acpi_lpss_create_device() * pm-domains: PM / Domains: Avoid infinite loops in attach/detach code * pm-sleep: PM / hibernate: clarify resume documentation