| commit | 91b4adc983d8e9975bc677c2b8395631edf7b92d | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Wed Mar 19 15:11:03 2014 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Wed Mar 19 15:11:03 2014 -0600 |
| tree | 4ab17c01721a0a9c0a7bdf07a4e53cf049ef6d19 | |
| parent | 2c0503f202f597325baae76e9f5686518e5ed0dd [diff] | |
| parent | 866d54177b4e671cd52bed1fb487d140d7b691f5 [diff] |
Merge branch 'pci/misc' into next * pci/misc: PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled