projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c04881e 5be967d)
Merge branch 'remotes/lorenzo/pci/ftpci100'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 6 Jul 2021 15:56:29 +0000 (10:56 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 6 Jul 2021 15:56:29 +0000 (10:56 -0500)
- Rename PCI_IOSIZE, etc in ftpci100 to avoid macro name collisions (Randy
  Dunlap)

* remotes/lorenzo/pci/ftpci100:
  PCI: ftpci100: Rename macro name collision


Trivial merge
Domain: System / Kernel;