diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-01-27 15:34:20 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-01-27 15:34:20 -0600 |
| commit | 341f3a2bcfa25462b55ec72939fd21692fa0d7c9 (patch) | |
| tree | f159c6a034df4a4e732ab071d2c816099b04bc60 /arch/m32r | |
| parent | e315110657e7335557a2500190b38ef33325a75c (diff) | |
| parent | 145b3fe579db66fbe999a2bc3fd5b63dffe9636d (diff) | |
| parent | a93b506e265a83a0f8c56ff003434e2d263961ce (diff) | |
| parent | 16b036af31e1456cb69243a5a0c9ef801ecd1f17 (diff) | |
| parent | 78e883585db49aa6d86b8817b770d7717699ab4e (diff) | |
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