From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 28 Nov 2019 14:54:47 +0000 (-0600)
Subject: Merge branch 'remotes/lorenzo/pci/mobiveil'
X-Git-Tag: v5.5-rc1~55^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4940330a3696c37d95cb8e16880c412c28748e2d;p=thirdparty%2Flinux.git

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
---

4940330a3696c37d95cb8e16880c412c28748e2d