| commit | 89000e89bf4df8b9a0a16e1d3856913907385bd5 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Tue Nov 14 12:11:33 2017 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Tue Nov 14 12:11:33 2017 -0600 |
| tree | 25bd1e3b55dc0ff6df1b76d61cf672f4fbbefdc7 | |
| parent | aaea12f7fe4c309c8cfa9040cbb3cb02feae0b4d [diff] | |
| parent | 84d897d69938a33f4ce3877c82d573e7a2b4e5a9 [diff] |
Merge branch 'pci/host-layerscape' into next * pci/host-layerscape: PCI: layerscape: Change default error response behavior PCI: Disable MSI for Freescale Layerscape PCIe RC mode arm64: dts: ls1046a: Add PCIe controller DT nodes arm64: dts: ls1012a: Add PCIe controller DT node PCI: layerscape: Add support for ls1012a arm64: dts: ls1012a: Add MSI controller DT node irqchip/ls-scfg-msi: Add LS1012a MSI support