Merge branch 'pci/host-imx6' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 27 Sep 2013 19:24:10 +0000 (13:24 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 27 Sep 2013 19:24:10 +0000 (13:24 -0600)
commitd95d3d53c7ef85ec0dc87db63aece18212c337b0
treeb448db270fe34b5cb41120a909b1d54488d100ce
parent645e40f9c4c7b905843e4a8968e1136ee34e0206
parentbb38919ec56e0758c3ae56dfc091dcde1391353e
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