projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5fc054a f778a0d)
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)
commite7aaf90f9d9dbbba54f67c653a1c56c2bf117268
tree9f00f8d19ad3b4e0432b239c782410a5c7968c4ctree | snapshot
parent5fc054a54476f9e2b3d6cc3eeb1537aa549d0ba3commit | diff
parentf778a0d26fe3912424401e7b997155094de36487commit | 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
John Crispins staging tree