summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-03-16 13:57:43 -0400
committerDoug Ledford <dledford@redhat.com>2016-03-16 13:57:43 -0400
commit082eaa50838c6b70a8244f8b01d7ed7d686f84db (patch)
tree7ac5de479cf26e6f26c7a30746266d7b222ff3dd /drivers/infiniband
parentd2ad9cc75963714d04d4596c226a499765950dbf (diff)
parenta82268b30a8b4b920d0bad24472cbb000c8e734a (diff)
parent3021376d6d12dd1be8a0a13c16dae8badb7766fd (diff)
parentdafb5587178afe8abf85f3ae91bbc88de9e54782 (diff)
Merge branches 'nes', 'cxgb4' and 'iwpm' into k.o/for-4.6