From: Bjorn Helgaas Date: Thu, 7 Nov 2013 22:02:04 +0000 (-0700) Subject: Merge branch 'pci/misc' into next X-Git-Tag: v3.13-rc1~95^2 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=eaaeb1cb33310dea6c3fa45d8bfc63e5a1d0a846;p=~andy%2Flinux 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() --- eaaeb1cb33310dea6c3fa45d8bfc63e5a1d0a846