Merge branch 'pci/iommu' into next

Browse source

* pci/iommu:
  PCI: Add bridge DMA alias quirk for ASMedia and Tundra bridges
  PCI: Add support for PCIe-to-PCI bridge DMA alias quirks
  PCI: Add function 1 DMA alias quirk for Marvell devices
  PCI: Add function 0 DMA alias quirk for Ricoh devices
  PCI: Add support for DMA alias quirks
  PCI: Convert pci_dev_flags definitions to bit shifts
  PCI: Add DMA alias iterator

...

This commit is contained in:

Bjorn Helgaas 2014-06-02 16:18:48 -06:00

parent 617b4157a5 ebdb51eb78

commit 0eeb4f2af5

3 changed files with 175 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

75

drivers/pci/quirks.c

View file

87

drivers/pci/search.c

View file

17

include/linux/pci.h

View file