]> git.karo-electronics.de Git - linux-beck.git/commitdiff
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)
* pci/host-imx6:
  PCI: imx6: Add support for i.MX6 PCIe controller
  ARM: imx6q: Add PCIe bits to GPR syscon definition


Trivial merge