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)
commit614d7426ec109501e9e77be66963caf3041e566c
tree790b6699c381ba1e42b3bc0383047b225662fb08
parentf86e7bc9683ee6dbde56d4bd4fda65f085b814d0
parent883461679ad1ed6e09135adf8c02bb98d7962623
Merge branch 'acpi-hotplug'

* 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
drivers/acpi/pci_root.c
drivers/acpi/scan.c