Merge branch 'acpi-hotplug'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 00:05:46 +0000 (01:05 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 00:05:46 +0000 (01:05 +0100)
* acpi-hotplug:
  ACPI / scan: Set flags.match_driver in acpi_bus_scan_fixed()
  ACPI / PCI root: Clear driver_data before failing enumeration
  ACPI / hotplug: Fix PCI host bridge hot removal
  ACPI / hotplug: Fix acpi_bus_get_device() return value check

1  2 
drivers/acpi/pci_root.c
drivers/acpi/scan.c

Simple merge
Simple merge