From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 28 Apr 2017 15:32:54 +0000 (-0500)
Subject: Merge branch 'pci/host-imx6' into next
X-Git-Tag: v4.12-rc1~65^2~16
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=7284a62dfd7066919bf9a7318f6dbc7b51a092db;p=karo-tx-linux.git

Merge branch 'pci/host-imx6' into next

* pci/host-imx6:
  PCI: imx6: Fix spelling mistake: "contol" -> "control"
  PCI: imx6: Do not switch speed if Gen2 is disabled
  PCI: imx6: Do not wait for speed change on i.MX7
  PCI: imx6: Allow probe deferral by reset GPIO
  PCI: imx6: Add code to support i.MX7D
---

7284a62dfd7066919bf9a7318f6dbc7b51a092db