diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-01-20 11:47:54 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-01-20 11:47:54 -0600 |
| commit | 904f664b585cc9f3dc134a8c0dd08e9bce6c10bc (patch) | |
| tree | 1f4a35077432459c6f7e782c62e55095777af44d | |
| parent | 3a6384ba105ebbb5e83d040a55bfad2fa43f3048 (diff) | |
| parent | 8b9b963e55a8a8eadf604c0d60b97249c468e706 (diff) | |
| parent | c2e771b02792d222cbcd9617fe71482a64f52647 (diff) | |
Merge branches 'pci/iommu' and 'pci/misc' into next
* pci/iommu:
PCI: Add function 1 DMA alias quirk for Lite-On/Plextor M6e/Marvell 88SS9183
* pci/misc:
PCI: Limit config space size for Netronome NFP4000
PCI: Add Netronome NFP4000 PF device ID