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)
* pci/shengzhou-irq:
  PCI: Use dev->irq instead of dev->pin to enable non MSI/INTx interrupt

1  2 
drivers/pci/pcie/portdrv_core.c

Simple merge