]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pci/host-imx6' into for-linus
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Sep 2014 20:20:25 +0000 (14:20 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Sep 2014 20:20:25 +0000 (14:20 -0600)
* pci/host-imx6:
  PCI: imx6: Put LTSSM in "Detect" state before disabling it
  MAINTAINERS: Add Lucas Stach as co-maintainer for i.MX6 PCI driver


Trivial merge