diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 13:41:08 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 13:41:08 +0100 |
commit | d1badf8d4323cfc9325b06651bdfcf7df09f1f0e (patch) | |
tree | 08a8a8dab1955bb07724028ece639267502a07ba /virt | |
parent | ACPI / hotplug / driver core: Handle containers in a special way (diff) | |
parent | ACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug (diff) | |
download | linux-d1badf8d4323cfc9325b06651bdfcf7df09f1f0e.tar.xz linux-d1badf8d4323cfc9325b06651bdfcf7df09f1f0e.zip |
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
Conflicts:
include/acpi/acpi_bus.h
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions