tree 0b89d0902d3a1544ec701ce90e1b461a731e2275
parent 9f3d16207146c56902b3de79a2c3537d81782d8d
parent ae4fa5f4502bfa7e7f31fc99a1da41189422642d
parent 4f092fec67191f899fa111a4eeffdf4368494c77
author Bjorn Helgaas <bhelgaas@google.com> 1434668205 -0500
committer Bjorn Helgaas <bhelgaas@google.com> 1434668205 -0500

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