projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd7155f f91ce35)
Merge branch 'pci/hotplug-vga' into for-linus
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 15 Sep 2014 19:18:36 +0000 (13:18 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 15 Sep 2014 19:18:36 +0000 (13:18 -0600)
* pci/hotplug-vga:
  ACPIPHP / radeon / nouveau: Remove acpi_bus_no_hotplug()
  PCI: Add pci_ignore_hotplug() to ignore hotplug events for a device


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.