tree 3bd2817f1e84d652dee75fc513d0fbc92e465fbc
parent 5d833a6ce87fba95d1afafddfeaaf42d7f19a4a0
parent 9cad7f582055513fe13a93fee3ddb213656a6a5d
author Bjorn Helgaas <bhelgaas@google.com> 1392931857 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1392931857 -0700

Merge branch 'pci/pciehp' into next

* pci/pciehp:
  PCI: pciehp: Cleanup whitespace
  PCI: pciehp: Remove a non-existent card, regardless of "surprise" capability
  PCI: pciehp: Don't turn slot off when hot-added device already exists
  PCI: pciehp: Add hotplug_lock to serialize hotplug events
  PCI: pciehp: Ensure very fast hotplug events are also processed
  PCI: pciehp: Disable link notification across slot reset
  PCI: pciehp: Don't check adapter or latch status while disabling
  PCI: pciehp: Don't disable the link permanently during removal
  PCI: pciehp: Enable link state change notifications
  PCI: pciehp: Use link change notifications for hot-plug and removal
  PCI: pciehp: Make check_link_active() non-static