Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 13 Dec 2013 17:20:05 +0000 (10:20 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 13 Dec 2013 17:20:05 +0000 (10:20 -0700)
commit6c52f51ccbb371d9161a1081560df7d31df4c495
treed7f6a7e989c161840f3f7ea66edc846653e4ea19
parentfa4378041e6c285399fa1a104d8dd77daae4529f
parent5b764b834ea925b7fc87df4a87a0fde95acbecb9
Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Stop clearing bridge Secondary Status when setting up I/O aperture
  PCI: Prevent bus conflicts while checking for bridge apertures
  PCI: Drop "irq" param from *_restore_msi_irqs()
  PCI/portdrv: Remove superfluous name cast
  PCI: Clear NumVFs when disabling SR-IOV in sriov_init()