Merge branch 'pci/shengzhou-irq' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 10 Sep 2012 22:35:40 +0000 (16:35 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 10 Sep 2012 22:35:40 +0000 (16:35 -0600)
commita690a4cbf09f70723f9721ca96ab8b2b472b3391
tree891858bf8e351a2a9eb907e5075d02f721aceea6
parent5aaa71cf12f998e7073e36e8efa45d45656d9ace
parente237d83fdf0313d26af46f41b69b3b87d62669c0
Merge branch 'pci/shengzhou-irq' into next

* pci/shengzhou-irq:
  PCI: Use dev->irq instead of dev->pin to enable non MSI/INTx interrupt
drivers/pci/pcie/portdrv_core.c