From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 2 Jun 2014 22:18:48 +0000 (-0600)
Subject: Merge branch 'pci/iommu' into next
X-Git-Tag: firefly_0821_release~176^2~3767^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0eeb4f2af5f71f64ba6362df33ddc1f218075c52;p=firefly-linux-kernel-4.4.55.git

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
---

0eeb4f2af5f71f64ba6362df33ddc1f218075c52