Merge branch 'pci/hotplug' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:15 +0000 (13:24 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:15 +0000 (13:24 -0500)
commitcf5f9cc8e4e5e8e0ecc35f1c904d98f889be2c0f
tree4446eb5958daec2286233ce3259aee9e25166c30
parentc5efc2209505916b6dbcd7ebe9412707b02dbc2f
parent7612b3b28c0b900dcbcdf5e9b9747cc20a1e2455
Merge branch 'pci/hotplug' into next

* pci/hotplug:
  PCI: pciehp: Report power fault only once until we clear it
  PCI: shpchp: Enable bridge bus mastering if MSI is enabled