Merge branch 'acpi-hotplug'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 20:18:13 +0000 (21:18 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 20:18:13 +0000 (21:18 +0100)
commited6a82546d2e8f6b5902269541733814d4adacc2
treea7c472289a1e3813057fb47cb50d95e55cdf7e65
parentb38f67c4ae35eb4bcea0bf42a0a18a778a5d04c2
parent296e5809ee567e41d55da41a882abef9d8071e5e
Merge branch 'acpi-hotplug'

* acpi-hotplug:
  PCI / hotplug / ACPI: Drop unused acpiphp_debug declaration
drivers/pci/hotplug/acpiphp.h