From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 7 Sep 2017 18:24:00 +0000 (-0500)
Subject: Merge branch 'pci/host-iproc' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=352948c414d92784a2edb762554d1c682ebd4661;p=linux.git

Merge branch 'pci/host-iproc' into next

* pci/host-iproc:
  PCI: iproc: Clean up whitespace
  PCI: iproc: Rename PCI_EXP_CAP to IPROC_PCI_EXP_CAP
  PCI: iproc: Add 500ms delay during device shutdown
  PCI: iproc: Work around Stingray CRS defects
  PCI: iproc: Factor out memory-mapped config access address calculation
  PCI: iproc: Remove unused struct iproc_pcie *pcie
---

352948c414d92784a2edb762554d1c682ebd4661