| commit | e7aaf90f9d9dbbba54f67c653a1c56c2bf117268 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Wed Aug 15 14:59:03 2018 -0500 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Wed Aug 15 14:59:03 2018 -0500 |
| tree | 9f00f8d19ad3b4e0432b239c782410a5c7968c4c | |
| parent | 5fc054a54476f9e2b3d6cc3eeb1537aa549d0ba3 [diff] | |
| parent | f778a0d26fe3912424401e7b997155094de36487 [diff] |
Merge branch 'pci/switchtec' - Add DMA alias quirk for Microsemi Switchtec NTB (Doug Meyer) - Expand documentation for pci_add_dma_alias() (Logan Gunthorpe) * pci/switchtec: PCI: Expand documentation for pci_add_dma_alias() PCI: Add DMA alias quirk for Microsemi Switchtec NTB switchtec: Use generic PCI Vendor ID and Class Code # Conflicts: # drivers/pci/quirks.c