commit | 40246603f8f4df99c7cdb88b2d472837e9e5a270 | [log] [tgz] |
---|---|---|
author | Bjorn Helgaas <bhelgaas@google.com> | Thu Oct 31 13:58:38 2013 -0600 |
committer | Bjorn Helgaas <bhelgaas@google.com> | Thu Oct 31 13:58:38 2013 -0600 |
tree | d3ee6a41e355e6e8eb4ecefae9a352aa111e232f | |
parent | 356bd765e2242bd351964bc2cca602dcee05c19d [diff] | |
parent | f216f57ffe6eede3c8a763add65d331e688f8c56 [diff] |
Merge branch 'pci/host-imx6' into next * pci/host-imx6: PCI: imx6: Probe the PCIe in fs_initcall() PCI: imx6: Remove redundant of_match_ptr PCI: imx6: Increase link startup timeout PCI: imx6: Fix imprecise abort handler PCI: imx6: Remove redundant dev_err() in imx6_pcie_probe()