]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
projects / ~emulex / infiniband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa43780 5b764b8)
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)
* 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()


Trivial merge
Emulex OneConnect RDMA Driver