From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 15 Sep 2014 19:18:36 +0000 (-0600)
Subject: Merge branch 'pci/hotplug-vga' into for-linus
X-Git-Tag: firefly_0821_release~176^2~3180^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6de8eee17a324a4fd8d1a4588a18e976b68f330c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/hotplug-vga' into for-linus

* pci/hotplug-vga:
  ACPIPHP / radeon / nouveau: Remove acpi_bus_no_hotplug()
  PCI: Add pci_ignore_hotplug() to ignore hotplug events for a device
---

6de8eee17a324a4fd8d1a4588a18e976b68f330c