Merge branch 'pci/host-layerscape' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 12 Dec 2016 17:25:09 +0000 (11:25 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 12 Dec 2016 17:25:09 +0000 (11:25 -0600)
commit46275d43c8dbf13d8b0c6e7a455608eeb220a677
treeb4d4725f448181dc0f587310ebfd782909227027
parentf887e24e0544cb239531c171f835e7e7aac4863b
parent1d77040bde2d21dc7db575d4b43c1da24c94cca1
Merge branch 'pci/host-layerscape' into next

* pci/host-layerscape:
  PCI: layerscape: Add LS1046a support
  PCI: layerscape: Remove redundant error message from ls_pcie_probe()