Merge branch 'acpi-pci-hotplug' into acpi-hotplug

Conflicts:
	include/acpi/acpi_bus.h

diff --cc drivers/acpi/bus.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_acpi.c
Simple merge

diff --cc drivers/pci/hotplug/acpiphp_glue.c
Simple merge

diff --cc include/acpi/acpi_bus.h
index 48d3025,ca49ebd..e4ab7be
--- 1/include/acpi/acpi_bus.h
--- 2/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@@ -161,9 -168,8 +161,10 @@@ struct acpi_device_flags 
        u32 ejectable:1;
        u32 power_manageable:1;
        u32 match_driver:1;
-       u32 reserved:25;
 +      u32 initialized:1;
 +      u32 visited:1;
 -      u32 reserved:26;
+       u32 no_hotplug:1;
++      u32 reserved:24;
  };
  
  /* File System */