From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 13 Dec 2013 17:20:05 +0000 (-0700)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: firefly_0821_release~176^2~4608^2~29
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6c52f51ccbb371d9161a1081560df7d31df4c495;p=firefly-linux-kernel-4.4.55.git

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

6c52f51ccbb371d9161a1081560df7d31df4c495