]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfc44fa424e1c319b11206faa267239cde5905b19
tree08a8a8dab1955bb07724028ece639267502a07ba
parent467a68363d6f75ce03277e5803dc307d8208ab6a
parent996bbb4f110c699a8672e1232180b4fa2ec3738c
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