projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 741f8e7 42fe2f9)
Merge branch 'lorenzo/pci/mediatek'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:37 +0000 (16:10 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:37 +0000 (16:10 -0500)
commitcc64520f970a0b9a2d94c815d9bf5fd5c88f213d
treebb8e9f2daed41093f32448716205230dbf95d6fbtree | snapshot
parent741f8e7ecc2c6414cff442ec8eb07dcfe4481533commit | diff
parent42fe2f91b4ebc07c815fb334ea1262e6dc23bf77commit | diff
Merge branch 'lorenzo/pci/mediatek'

  - implement Mediatek chained IRQ handling (Honghui Zhang)

  - fix vendor ID & class type for Mediatek MT7622 (Honghui Zhang)

* lorenzo/pci/mediatek:
  PCI: mediatek: Implement chained IRQ handling setup
  PCI: mediatek: Set up vendor ID and class type for MT7622

# Conflicts:
# drivers/pci/host/Kconfig
drivers/pci/host/Kconfig diff1 | diff2 | blob | history
drivers/pci/host/pcie-mediatek.c diff1 | diff2 | blob | history
include/linux/pci_ids.h diff1 | diff2 | blob | history
John Crispins staging tree