commit | d95d3d53c7ef85ec0dc87db63aece18212c337b0 | [log] [tgz] |
---|---|---|
author | Bjorn Helgaas <bhelgaas@google.com> | Fri Sep 27 13:24:10 2013 -0600 |
committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Sep 27 13:24:10 2013 -0600 |
tree | b448db270fe34b5cb41120a909b1d54488d100ce | |
parent | 645e40f9c4c7b905843e4a8968e1136ee34e0206 [diff] | |
parent | bb38919ec56e0758c3ae56dfc091dcde1391353e [diff] |
Merge branch 'pci/host-imx6' into next * pci/host-imx6: PCI: imx6: Add support for i.MX6 PCIe controller ARM: imx6q: Add PCIe bits to GPR syscon definition