Skip to content
Commit 904f664b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment