From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 12 Dec 2016 17:25:03 +0000 (-0600)
Subject: Merge branch 'pci/hotplug' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4617aedbd2a718f3c7ad5858fb64ea0f0a46f7da;p=linux-beck.git

Merge branch 'pci/hotplug' into next

* pci/hotplug:
  PCI: pciehp: Leave power indicator on when enabling already-enabled slot
  PCI: pciehp: Prioritize data-link event over presence detect
  PCI: cpqphp: Add missing call to pci_disable_device()
---

4617aedbd2a718f3c7ad5858fb64ea0f0a46f7da