| commit | 0eeb4f2af5f71f64ba6362df33ddc1f218075c52 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Mon Jun 02 16:18:48 2014 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Mon Jun 02 16:18:48 2014 -0600 |
| tree | a5ba0181900968cda030364e18235e93f975b093 | |
| parent | 617b4157a5c82ab3e9509aa388bfd3d47e0e623a [diff] | |
| parent | ebdb51eb7806df56221d4536a6a9702751d6df85 [diff] |
Merge branch 'pci/iommu' into next * 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