projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f0f373 c4ae2ad)
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)
* 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()


Trivial merge
Domain: System / Kernel;