From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 27 Jan 2015 21:34:20 +0000 (-0600)
Subject: Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/resource' and 'pci/virtualizati... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=341f3a2bcfa25462b55ec72939fd21692fa0d7c9;p=deliverable%2Flinux.git

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
---

341f3a2bcfa25462b55ec72939fd21692fa0d7c9