diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 21:59:03 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 21:59:03 +0200 |
| commit | e7aaf90f9d9dbbba54f67c653a1c56c2bf117268 (patch) | |
| tree | 9f00f8d19ad3b4e0432b239c782410a5c7968c4c /drivers/edac/cell_edac.c | |
| parent | Merge branch 'pci/resource' (diff) | |
| parent | PCI: Expand documentation for pci_add_dma_alias() (diff) | |
| download | linux-e7aaf90f9d9dbbba54f67c653a1c56c2bf117268.tar.xz linux-e7aaf90f9d9dbbba54f67c653a1c56c2bf117268.zip | |
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
Diffstat (limited to 'drivers/edac/cell_edac.c')
0 files changed, 0 insertions, 0 deletions