summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-01-31 19:10:30 +0300
committerBjorn Helgaas <helgaas@kernel.org>2018-01-31 19:10:30 +0300
commit5be31686cf4752443e669f48843eed036c69f999 (patch)
tree2b13b1c012f929de0a897f1088c8c330b7e786a4 /drivers/watchdog
parent6b290397afb89ac23f29be30c6637756d256f959 (diff)
parent20c3ff6114b0c32beb85d476d7331ad9ab1942e2 (diff)
downloadlinux-5be31686cf4752443e669f48843eed036c69f999.tar.xz
Merge branch 'pci/enumeration' into next
* pci/enumeration: RDMA/qedr: Use pci_enable_atomic_ops_to_root() PCI: Add pci_enable_atomic_ops_to_root() PCI: Make PCI_SCAN_ALL_PCIE_DEVS work for Root as well as Downstream Ports
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions