tree a76b60ff193a29b521e1bd63943a6d1969fe9af4
parent c245f2422031fec447e4d9e35fb0ef0fd5e42ab9
parent 79272138bd5c35edb9be5ae7b473a2741751a706
author Bjorn Helgaas <bhelgaas@google.com> 1383861724 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1383861724 -0700

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()