From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 28 May 2014 22:21:25 +0000 (-0600)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: v3.16-rc1~29^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fdaf36bd360fe1e74b34262ad705ef39d52c12de;p=~emulex%2Finfiniband.git

Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Fix return value from pci_user_{read,write}_config_*()
  PCI: Turn pcibios_penalize_isa_irq() into a weak function
  PCI: Test for std config alias when testing extended config space
---

fdaf36bd360fe1e74b34262ad705ef39d52c12de