]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b7e50f6 6678408)
Merge branch 'pci/switchtec'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2018 19:59:03 +0000 (14:59 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2018 19:59:03 +0000 (14:59 -0500)
commit98531d475c1736ce4acaa664767d4e2d35973133
tree9f00f8d19ad3b4e0432b239c782410a5c7968c4ctree | snapshot
parentb7e50f685b62dabca7edaed1d5f4b48ba8ca1ff5commit | diff
parent6678408f5a31cfa17a3c04d28d943776476e1562commit | 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
drivers/pci/pci.c diff1 | diff2 | blob | history
drivers/pci/quirks.c diff1 | diff2 | blob | history
include/linux/pci_ids.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.