]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit55efc010f2b183aa7fe15ee74d3300bdf9659f1b
treebfdedb1c3a2bf047ac39873e01fe9dcf1ff2cbfe
parentafe5acccdd55f0927b7dc47af1c8f81db9631c68
parent865dd1fd81879adf8805a2644235afee5056bfb5
Merge branch 'remotes/lorenzo/pci/ftpci100'

- Rename PCI_IOSIZE, etc in ftpci100 to avoid macro name collisions (Randy
  Dunlap)

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