diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-15 11:56:07 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-15 11:56:07 -0600 |
commit | af3a2ab5daa0b8bf188a039c122a670cdc8b9544 (patch) | |
tree | 2f6ddec5a2c66b61cebd5f24b906100eeefcbee1 /drivers/watchdog/octeon-wdt-main.c | |
parent | 8f417ca9ebfa8701a41db64f5ed9cbb01b8e4219 (diff) | |
parent | abdbf4d635a9a8c956bb9757a9d4f08c2abe1f97 (diff) |
Merge branch 'pci/dpc' into next
* pci/dpc:
PCI/DPC: Wait for Root Port busy to clear
PCI/DPC: Decode extended reasons
Diffstat (limited to 'drivers/watchdog/octeon-wdt-main.c')
0 files changed, 0 insertions, 0 deletions