From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 18 Jun 2015 22:56:45 +0000 (-0500)
Subject: Merge branches 'pci/host-xgene' and 'pci/hotplug' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=207b074f82c6790f008bfe055c37b47047eb2122;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branches 'pci/host-xgene' and 'pci/hotplug' into next

* pci/host-xgene:
  PCI: xgene: Allow config access to Root Port even when link is down
  PCI: xgene: Disable Configuration Request Retry Status for v1 silicon

* pci/hotplug:
  PCI: pciehp: Inline the "handle event" functions into the ISR
  PCI: pciehp: Rename queue_interrupt_event() to pciehp_queue_interrupt_event()
  PCI: pciehp: Make queue_interrupt_event() void
  PCI: pciehp: Clean up debug logging
---

207b074f82c6790f008bfe055c37b47047eb2122