From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 19 Mar 2014 21:11:03 +0000 (-0600)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: firefly_0821_release~176^2~4197^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=91b4adc983d8e9975bc677c2b8395631edf7b92d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
---

91b4adc983d8e9975bc677c2b8395631edf7b92d