Merge branch 'acpi-hotplug'

* acpi-hotplug:
  PCI / hotplug / ACPI: Drop unused acpiphp_debug declaration