Merge branch 'acpi-hotplug'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Aug 2013 12:14:25 +0000 (14:14 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Aug 2013 12:14:25 +0000 (14:14 +0200)
commit7bc583d102d6f89c3dc4b502caec6ba03c9d318f
tree550e6333f2205f006849984b52408ed796bcd0c5
parentda48afb26b40ebb5d6b0e84793e0662859c7ea20
parentf943db40c29f3c82a56956e9ca36f21d6d855db9
Merge branch 'acpi-hotplug'

* acpi-hotplug:
  ACPI / hotplug: Remove containers synchronously
  driver core / ACPI: Avoid device hot remove locking issues
drivers/acpi/scan.c
include/acpi/acpi_bus.h