| commit | 4617aedbd2a718f3c7ad5858fb64ea0f0a46f7da | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Mon Dec 12 11:25:03 2016 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Mon Dec 12 11:25:03 2016 -0600 |
| tree | ed68108d454e4bc92c295415356e02a137205e39 | |
| parent | 2f0f3733c4c6376853bfc2f4801888bcbc99308f [diff] | |
| parent | c4ae2adedb38240be5a1a16588406980b948a3e7 [diff] |
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()