Merge branch 'remotes/lorenzo/pci/mobiveil'
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 28 Nov 2019 14:54:47 +0000 (08:54 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 28 Nov 2019 14:54:47 +0000 (08:54 -0600)
commit4940330a3696c37d95cb8e16880c412c28748e2d
treea96c1264c721299cf548ea1930db809a1f6acfeb
parent30c50d3a26a512890f30e2a9c4899fa9f4ce48d7
parent4906c05b87d44c19b225935e24d62e4480ca556d
Merge branch 'remotes/lorenzo/pci/mobiveil'

  - Change mobiveil csr_read()/write() function names that conflict with
    riscv arch functions (Kefeng Wang)

* remotes/lorenzo/pci/mobiveil:
  PCI: mobiveil: Fix csr_read()/write() build issue