Merge branch 'acpi-pci-hotplug' into acpi-hotplug
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 31 Dec 2013 12:41:08 +0000 (13:41 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 31 Dec 2013 12:41:08 +0000 (13:41 +0100)
commitd1badf8d4323cfc9325b06651bdfcf7df09f1f0e
tree08a8a8dab1955bb07724028ece639267502a07ba
parentcaa73ea158de9419f08e456f2716c71d1f06012a
parentf244d8b623dae7a7bc695b0336f67729b95a9736
Merge branch 'acpi-pci-hotplug' into acpi-hotplug

Conflicts:
include/acpi/acpi_bus.h
drivers/acpi/bus.c
drivers/gpu/drm/nouveau/nouveau_acpi.c
drivers/pci/hotplug/acpiphp_glue.c
include/acpi/acpi_bus.h