diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-02 16:18:48 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-02 16:18:48 -0600 |
| commit | 0eeb4f2af5f71f64ba6362df33ddc1f218075c52 (patch) | |
| tree | a5ba0181900968cda030364e18235e93f975b093 /fs/nfsd | |
| parent | 617b4157a5c82ab3e9509aa388bfd3d47e0e623a (diff) | |
| parent | ebdb51eb7806df56221d4536a6a9702751d6df85 (diff) | |
| download | linux-stable-0eeb4f2af5f71f64ba6362df33ddc1f218075c52.tar.gz linux-stable-0eeb4f2af5f71f64ba6362df33ddc1f218075c52.tar.bz2 linux-stable-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 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions