aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-07 22:48:14 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-07 22:48:14 +0200
commitd0aee67fa19260d772b07f144cf6c93e63431f67 (patch)
tree3ab24b9981da7a57742c9dce217218d014284c85 /drivers/base
parentMerge branch 'pm-wakeirq' (diff)
parentACPI / PNP: Reserve ACPI resources at the fs_initcall_sync stage (diff)
parentACPI / LPSS: Fix up acpi_lpss_create_device() (diff)
parentPM / Domains: Avoid infinite loops in attach/detach code (diff)
parentPM / hibernate: clarify resume documentation (diff)
downloadlinux-dev-d0aee67fa19260d772b07f144cf6c93e63431f67.tar.xz
linux-dev-d0aee67fa19260d772b07f144cf6c93e63431f67.zip
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