]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
* pci/host-layerscape:
  PCI: layerscape: Add LS1046a support
  PCI: layerscape: Remove redundant error message from ls_pcie_probe()


Trivial merge