Merge branch 'acpi-hotplug'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 10 Sep 2013 21:14:53 +0000 (23:14 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 10 Sep 2013 21:14:53 +0000 (23:14 +0200)
commit85fb0a1c35d86ed9a4de8d6cba79ba0801f7a1f7
tree4373e14df0aa4064e64cf318edd3e07f5e162270
parenta9238741987386bb549d61572973c7e62b2a4145
parent942f40155a743f4204308d62405dacaa4bfadb11
Merge branch 'acpi-hotplug'

* acpi-hotplug:
  PM / hibernate / memory hotplug: Rework mutual exclusion
  PM / hibernate: Create memory bitmaps after freezing user space
  ACPI / scan: Change ordering of locks for device hotplug
drivers/acpi/scan.c