summaryrefslogtreecommitdiff
path: root/drivers/infiniband/ulp
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-05-05 16:42:09 -0400
committerDoug Ledford <dledford@redhat.com>2016-05-05 16:42:09 -0400
commit94d7f1a255db84233a2da70b27d9abf9c0a57135 (patch)
tree1caea28f70315117432636945607d1eb2b772df7 /drivers/infiniband/ulp
parentccea5f0f01797a0c0b6cba8176ecda3b10ca8534 (diff)
parentd35cf74492c5ba0d8e1c08755c78be4ef3af650e (diff)
parent6973627968acbdf7d6f45a4c4813d46bf8e2a66a (diff)
Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7