Merge branch 'pci/hotplug' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 12 Dec 2016 17:25:03 +0000 (11:25 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 12 Dec 2016 17:25:03 +0000 (11:25 -0600)
commit4617aedbd2a718f3c7ad5858fb64ea0f0a46f7da
treeed68108d454e4bc92c295415356e02a137205e39
parent2f0f3733c4c6376853bfc2f4801888bcbc99308f
parentc4ae2adedb38240be5a1a16588406980b948a3e7
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()