tree 1dc8fb4fd29f5c2d5f40679e2f3022e36898fd67
parent c5cb85b2583755dcbc7321485947359f6951f75c
parent a6c1c6f3547b6c4cbd4a30d67a968ee1519a8ffd
parent a4959d8c1eaa4893b3f72d505e977ae53bce2f03
parent e16b46605960bd071a3e26f316e0bb600ae91e37
parent 2a2aca316aedae815cc3d7e9ba0b30ec5d8a5edf
parent 3ee803641e76bea76ec730c80dcc64739a9919ff
parent ed91de7e14fb20b7db9981ab2a34f6d114bf50a0
parent 9fad4012db45c975321cdb9d8b7bdc21a8d59000
author Bjorn Helgaas <bhelgaas@google.com> 1470072211 -0500
committer Bjorn Helgaas <bhelgaas@google.com> 1470072211 -0500

Merge branches 'pci/aspm', 'pci/dpc', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/pm' and 'pci/virtualization' into next

* pci/aspm:
  PCI/ASPM: Remove redundant check of pcie_set_clkpm

* pci/dpc:
  PCI: Remove DPC tristate module option
  PCI: Bind DPC to Root Ports as well as Downstream Ports
  PCI: Fix whitespace in struct dpc_dev
  PCI: Convert Downstream Port Containment driver to use devm_* functions

* pci/hotplug:
  PCI: Allow additional bus numbers for hotplug bridges

* pci/misc:
  PCI: Include <asm/dma.h> for isa_dma_bridge_buggy
  PCI: Make bus_attr_resource_alignment static
  MAINTAINERS: Add file patterns for PCI device tree bindings
  PCI: Fix comment typo

* pci/msi:
  PCI/MSI: irqchip: Fix PCI_MSI dependencies

* pci/pm:
  PCI: pciehp: Ignore interrupts during D3cold
  PCI: Document connection between pci_power_t and hardware PM capability
  PCI: Add runtime PM support for PCIe ports
  ACPI / hotplug / PCI: Runtime resume bridge before rescan
  PCI: Power on bridges before scanning new devices
  PCI: Put PCIe ports into D3 during suspend
  PCI: Don't clear d3cold_allowed for PCIe ports
  PCI / PM: Enforce type casting for pci_power_t

* pci/virtualization:
  PCI: Add ACS quirk for Solarflare SFC9220
  PCI: Add DMA alias quirk for Adaptec 3805
  PCI: Mark Atheros AR9485 and QCA9882 to avoid bus reset
  PCI: Add function 1 DMA alias quirk for Marvell 88SE9182