]> asedeno.scripts.mit.edu Git - linux.git/commit
projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b2e6d30 3fb5561)
Merge branch 'pci/host-hisi' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 21 Feb 2017 21:14:18 +0000 (15:14 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 21 Feb 2017 21:14:18 +0000 (15:14 -0600)
commitd9520971589b008faa8df31aa2bb3d1e4f1c4534
tree5bbb628245575e29e7b30c72e8c5bb26187225bdtree | snapshot
parentb2e6d3055d5545b97533d4e8376fa848639d9951commit | diff
parent3fb5561879d71b5b80ddb48b3e7e5fa18c696d2acommit | 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
drivers/pci/dwc/pcie-hisi.c diff1 | diff2 | blob | history
drivers/pci/quirks.c diff1 | diff2 | blob | history
local clone of linux.git