Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 19 Mar 2014 21:11:03 +0000 (15:11 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 19 Mar 2014 21:11:03 +0000 (15:11 -0600)
* pci/misc:
  PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled

1  2 
drivers/pci/pci.c

Simple merge