diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:03 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:03 -0600 |
commit | 4617aedbd2a718f3c7ad5858fb64ea0f0a46f7da (patch) | |
tree | ed68108d454e4bc92c295415356e02a137205e39 /README | |
parent | 2f0f3733c4c6376853bfc2f4801888bcbc99308f (diff) | |
parent | c4ae2adedb38240be5a1a16588406980b948a3e7 (diff) | |
download | linux-4617aedbd2a718f3c7ad5858fb64ea0f0a46f7da.tar.bz2 |
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()
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions