summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-31 13:41:08 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-31 13:41:08 +0100
commitd1badf8d4323cfc9325b06651bdfcf7df09f1f0e (patch)
tree08a8a8dab1955bb07724028ece639267502a07ba /virt
parentACPI / hotplug / driver core: Handle containers in a special way (diff)
parentACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug (diff)
downloadlinux-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