summaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/pci-octeon.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-01-27 22:34:20 +0100
committerBjorn Helgaas <bhelgaas@google.com>2015-01-27 22:34:20 +0100
commit341f3a2bcfa25462b55ec72939fd21692fa0d7c9 (patch)
treef159c6a034df4a4e732ab071d2c816099b04bc60 /arch/mips/pci/pci-octeon.c
parentMerge branches 'pci/host-keystone', 'pci/host-tegra', 'pci/host-xgene' and 'p... (diff)
parentPCI: Generate uppercase hex for modalias var in uevent (diff)
parentPCI: pciehp: Handle surprise add even if surprise removal isn't supported (diff)
parentPCI: Fix infinite loop with ROM image of size 0 (diff)
parentPCI: Add Wellsburg (X99) to Intel PCH root port ACS quirk (diff)
downloadlinux-341f3a2bcfa25462b55ec72939fd21692fa0d7c9.tar.xz
linux-341f3a2bcfa25462b55ec72939fd21692fa0d7c9.zip
Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/resource' and 'pci/virtualization' into next
* pci/enumeration: PCI: Generate uppercase hex for modalias var in uevent * pci/hotplug: PCI: pciehp: Handle surprise add even if surprise removal isn't supported * pci/resource: PCI: Fix infinite loop with ROM image of size 0 * pci/virtualization: PCI: Add Wellsburg (X99) to Intel PCH root port ACS quirk PCI: Add DMA alias quirk for Adaptec 3405 PCI: Add ACS quirk for Emulex NICs PCI: Mark AMD/ATI VGA devices that don't reset on D3hot->D0 transition PCI: Add flag for devices that don't reset on D3hot->D0 transition PCI: Mark Atheros AR93xx to avoid bus reset PCI: Add flag for devices where we can't use bus reset