diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-05-05 16:42:09 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-05-05 16:42:09 -0400 |
| commit | 94d7f1a255db84233a2da70b27d9abf9c0a57135 (patch) | |
| tree | 1caea28f70315117432636945607d1eb2b772df7 /drivers/infiniband/ulp | |
| parent | ccea5f0f01797a0c0b6cba8176ecda3b10ca8534 (diff) | |
| parent | d35cf74492c5ba0d8e1c08755c78be4ef3af650e (diff) | |
| parent | 6973627968acbdf7d6f45a4c4813d46bf8e2a66a (diff) | |
Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7