| commit | 7284a62dfd7066919bf9a7318f6dbc7b51a092db | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Apr 28 10:32:54 2017 -0500 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Apr 28 10:32:54 2017 -0500 |
| tree | 70692fb0b0e981e04419f35a389f44702f9c2023 | |
| parent | 4940421013672aafdc8c372c17b5ddf63423c805 [diff] | |
| parent | 7221547e55b7929e4d46983f6f3ca15f36ee4dac [diff] |
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