diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-03 00:18:48 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-03 00:18:48 +0200 |
commit | 0eeb4f2af5f71f64ba6362df33ddc1f218075c52 (patch) | |
tree | a5ba0181900968cda030364e18235e93f975b093 /drivers/pci/rom.c | |
parent | Merge branches 'pci/host-exynos', 'pci/host-imx6', 'pci/resource' and 'pci/mi... (diff) | |
parent | PCI: Add bridge DMA alias quirk for ASMedia and Tundra bridges (diff) | |
download | linux-0eeb4f2af5f71f64ba6362df33ddc1f218075c52.tar.xz linux-0eeb4f2af5f71f64ba6362df33ddc1f218075c52.zip |
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
Diffstat (limited to 'drivers/pci/rom.c')
0 files changed, 0 insertions, 0 deletions