summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-12-10 19:40:14 -0600
committerBjorn Helgaas <bhelgaas@google.com>2015-12-10 19:40:14 -0600
commit800e07b609bf31c34c1fa08745812fc721101acc (patch)
tree2f5543f0e5ac65ef2e1943208253a9da8839f3c5 /drivers
parent1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff)
parent57d86a0485a30145382ad03b9504cc03ba4641c7 (diff)
parent64609eaab242d36e3e3b7cb81d31a028719feb74 (diff)
parent96ae6469ba16ae502d2b2db4b5c9b7c846262999 (diff)
parent128fc68ca1c3c73ed35ef9c7c50b8972de40322f (diff)
Merge branches 'pci/aspm', 'pci/hotplug', 'pci/misc' and 'pci/msi' into next
* pci/aspm: PCI/ASPM: Make sysfs link_state_store() consistent with link_state_show() * pci/hotplug: PCI: pciehp: Always protect pciehp_disable_slot() with hotplug mutex * pci/misc: x86/PCI: Simplify pci_bios_{read,write} PCI: Simplify config space size computation PCI: Limit config space size for Netronome NFP6000 family PCI: Add Netronome vendor and device IDs PCI: Support PCIe devices with short cfg_size x86/PCI: Clarify AMD Fam10h config access restrictions comment PCI: Print warnings for all invalid expansion ROM headers PCI: Check for PCI_HEADER_TYPE_BRIDGE equality, not bitmask * pci/msi: PCI/MSI: Remove empty pci_msi_init_pci_dev() PCI/MSI: Initialize MSI capability for all architectures