summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/cxgb4/provider.c
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-03-16 18:57:43 +0100
committerDoug Ledford <dledford@redhat.com>2016-03-16 18:57:43 +0100
commit082eaa50838c6b70a8244f8b01d7ed7d686f84db (patch)
tree7ac5de479cf26e6f26c7a30746266d7b222ff3dd /drivers/infiniband/hw/cxgb4/provider.c
parentMerge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6 (diff)
parentnes: handling failed allocation when creating workqueue (diff)
parentinfiniband: cxgb4: use %pR format string for printing resources (diff)
parentiwpm: crash fix for large connections test (diff)
downloadlinux-082eaa50838c6b70a8244f8b01d7ed7d686f84db.tar.xz
linux-082eaa50838c6b70a8244f8b01d7ed7d686f84db.zip
Merge branches 'nes', 'cxgb4' and 'iwpm' into k.o/for-4.6