Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
This commit is contained in:
Bjorn Helgaas 2014-03-19 15:11:03 -06:00
commit 91b4adc983