Merge branches 'pci/iommu' and 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 20 Jan 2016 17:47:54 +0000 (11:47 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 20 Jan 2016 17:47:54 +0000 (11:47 -0600)
commit904f664b585cc9f3dc134a8c0dd08e9bce6c10bc
tree1f4a35077432459c6f7e782c62e55095777af44d
parent3a6384ba105ebbb5e83d040a55bfad2fa43f3048
parent8b9b963e55a8a8eadf604c0d60b97249c468e706
parentc2e771b02792d222cbcd9617fe71482a64f52647
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
drivers/pci/quirks.c