From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 4 Apr 2018 18:28:11 +0000 (-0500)
Subject: Merge branch 'pci/resource-mmap'
X-Git-Tag: v4.17-rc1~93^2~15
X-Git-Url: https://git.codelabs.ch/?p=muen%2Flinux.git;a=commitdiff_plain;h=1e1b3201ab18df5f7beafa68581bc82a504b1575

Merge branch 'pci/resource-mmap'

  - use generic pci_mmap_resource_range() instead of powerpc and xtensa
    arch-specific versions (David Woodhouse)

* pci/resource-mmap:
  xtensa/PCI: Use generic pci_mmap_resource_range()
  powerpc/pci: Use generic pci_mmap_resource_range()
---

1e1b3201ab18df5f7beafa68581bc82a504b1575