tree 26abf6c7defad14a5e28606979940735b56f4382
parent 2fc32c92593dd7900c0635398800214733b8b397
parent 27d868b5e6cfaee4fec66b388e4085ff94050fa7
parent 91f15fb30c77d4a0d0d9b97e5cec647650853145
author Bjorn Helgaas <bhelgaas@google.com> 1440795188 -0500
committer Bjorn Helgaas <bhelgaas@google.com> 1440795188 -0500

Merge branches 'pci/enumeration' and 'pci/misc' into next

* pci/enumeration:
  PCI: Set MPS to match upstream bridge
  PCI: Move MPS configuration check to pci_configure_device()
  PCI: Drop references acquired by of_parse_phandle()
  PCI/MSI: Remove unused pcibios_msi_controller() hook
  ARM/PCI: Remove msi_controller from struct pci_sys_data
  ARM/PCI, designware, xilinx: Use pci_scan_root_bus_msi()
  PCI: Add pci_scan_root_bus_msi()
  ARM/PCI: Replace panic with WARN messages on failures
  PCI: generic: Add arm64 support
  PCI: Build setup-irq.o for arm64
  PCI: generic: Remove dependency on ARM-specific struct hw_pci
  ARM/PCI: Set MPS before pci_bus_add_devices()

* pci/misc:
  PCI: Disable async suspend/resume for JMicron multi-function SATA/AHCI