From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 5 Nov 2021 16:28:53 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/xgene'
X-Git-Tag: v5.16-rc1~105^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dda4b381f05d447a0ae31e2e44aeb35d313a311f;p=thirdparty%2Flinux.git

Merge branch 'remotes/lorenzo/pci/xgene'

- Use PCI_VENDOR_ID_AMCC macro instead of defining a custom macro in
  pci-xgene.c (Pali Rohár)

* remotes/lorenzo/pci/xgene:
  PCI: xgene: Use PCI_VENDOR_ID_AMCC macro
---

dda4b381f05d447a0ae31e2e44aeb35d313a311f