From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Feb 2019 23:32:10 +0000 (-0800)
Subject: Merge tag 'pci-v5.0-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=70be9ac2b64c0d0db4f0e3004b764df33b1098e2;p=linux.git

Merge tag 'pci-v5.0-fixes-4' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX) that
  breaks PCIe on I.MX SoCs (Thinh Nguyen)"

* tag 'pci-v5.0-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX)
---

70be9ac2b64c0d0db4f0e3004b764df33b1098e2