From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 20 Feb 2014 21:30:57 +0000 (-0700)
Subject: Merge branch 'pci/pciehp' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9d68c783d7e48f0b8cdfc20cd29803b80efe5003;p=linux-beck.git

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

9d68c783d7e48f0b8cdfc20cd29803b80efe5003