diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:15 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:15 -0500 |
| commit | cf5f9cc8e4e5e8e0ecc35f1c904d98f889be2c0f (patch) | |
| tree | 4446eb5958daec2286233ce3259aee9e25166c30 /arch | |
| parent | c5efc2209505916b6dbcd7ebe9412707b02dbc2f (diff) | |
| parent | 7612b3b28c0b900dcbcdf5e9b9747cc20a1e2455 (diff) | |
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions