From: Bjorn Helgaas Date: Wed, 19 Mar 2014 21:11:03 +0000 (-0600) Subject: Merge branch 'pci/misc' into next X-Git-Tag: v3.15-rc1~143^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91b4adc983d8e9975bc677c2b8395631edf7b92d;p=pandora-kernel.git Merge branch 'pci/misc' into next * pci/misc: PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled --- 91b4adc983d8e9975bc677c2b8395631edf7b92d Reading git-diff-tree failed