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)
* acpi-hotplug:
  ACPI / hotplug: Remove containers synchronously
  driver core / ACPI: Avoid device hot remove locking issues

1  2 
drivers/acpi/scan.c
include/acpi/acpi_bus.h

Simple merge
Simple merge