diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:09 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:09 -0600 |
| commit | 46275d43c8dbf13d8b0c6e7a455608eeb220a677 (patch) | |
| tree | b4d4725f448181dc0f587310ebfd782909227027 /drivers/pci/hotplug/acpi_pcihp.c | |
| parent | f887e24e0544cb239531c171f835e7e7aac4863b (diff) | |
| parent | 1d77040bde2d21dc7db575d4b43c1da24c94cca1 (diff) | |
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()
Diffstat (limited to 'drivers/pci/hotplug/acpi_pcihp.c')
0 files changed, 0 insertions, 0 deletions