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)
commitfd7155fc9fca6464a5aa668965a3741b963f805f
treede09c4ec9710c207118fac0cd4ab52fde2f1d856
parent52addcf9d6669fa439387610bc65c92fa0980cef
parent3e3e406e3807235906ee0b7c697664ea6dfd88de
Merge branch 'pci/host-imx6' into for-linus

* 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