OSDN Git Service

Merge branch 'pci/host-iproc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:00 +0000 (13:24 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:00 +0000 (13:24 -0500)
commit352948c414d92784a2edb762554d1c682ebd4661
tree1d836efd5a4d7dd958a26c23ee36ba9cf3b338ed
parent8a21881ac4ef04a3568f077b2ab3a84c0aa32c47
parentef685b34126891528f9d2975980a791f4a12c5d7
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