Merge branches 'acpi-video' and 'acpi-hotplug'

* acpi-video:
  ACPI: Revert "ACPI / video: Add Dell Inspiron 5737 to the blacklist"

* acpi-hotplug:
  ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot()

diff --combined drivers/pci/hotplug/acpiphp_glue.c
index 5f2fda1,ff53856,0b3e0bf..fa49f91
--- 1/drivers/pci/hotplug/acpiphp_glue.c
--- 2/drivers/pci/hotplug/acpiphp_glue.c
--- 3/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@@@ -707,7 -707,7 -707,7 +707,7 @@@@ static void acpiphp_sanitize_bus(struc
        unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM;
   
        list_for_each_entry_safe_reverse(dev, tmp, &bus->devices, bus_list) {
 --             for (i=0; i<PCI_BRIDGE_RESOURCES; i++) {
 ++             for (i = 0; i < PCI_BRIDGE_RESOURCES; i++) {
                        struct resource *res = &dev->resource[i];
                        if ((res->flags & type_mask) && !res->start &&
                                        res->end) {
@@@@ -953,8 -953,8 -953,10 +953,10 @@@@ int acpiphp_enable_slot(struct acpiphp_
   {
        pci_lock_rescan_remove();
   
--      if (slot->flags & SLOT_IS_GOING_AWAY)
++      if (slot->flags & SLOT_IS_GOING_AWAY) {
++              pci_unlock_rescan_remove();
                return -ENODEV;
++      }
   
        /* configure all functions */
        if (!(slot->flags & SLOT_ENABLED))