Merge branch 'pci/misc' into next
commiteaaeb1cb33310dea6c3fa45d8bfc63e5a1d0a846
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Nov 2013 22:02:04 +0000 (7 15:02 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Nov 2013 22:02:04 +0000 (7 15:02 -0700)
treea76b60ff193a29b521e1bd63943a6d1969fe9af4
parentc245f2422031fec447e4d9e35fb0ef0fd5e42ab9
parent79272138bd5c35edb9be5ae7b473a2741751a706
Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Enable upstream bridges even for VFs on virtual buses
  PCI: Add pci_upstream_bridge()
  PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()
drivers/pci/pci.c