| commit | d9520971589b008faa8df31aa2bb3d1e4f1c4534 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Tue Feb 21 15:14:18 2017 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Tue Feb 21 15:14:18 2017 -0600 |
| tree | 5bbb628245575e29e7b30c72e8c5bb26187225bd | |
| parent | b2e6d3055d5545b97533d4e8376fa848639d9951 [diff] | |
| parent | 3fb5561879d71b5b80ddb48b3e7e5fa18c696d2a [diff] |
Merge branch 'pci/host-hisi' into next * pci/host-hisi: PCI: generic: Call pci_fixup_irqs() only on ARM PCI: Disable MSI for HiSilicon Hip06/Hip07 Root Ports PCI: hisi: Rename config space accessors to remove "acpi" PCI: hisi: Add DT almost-ECAM support for Hip06/Hip07 host controllers PCI: hisi: Use of_device_get_match_data() to simplify probe Conflicts: drivers/pci/dwc/pcie-hisi.c