diff options
author | Doug Ledford <dledford@redhat.com> | 2016-05-05 22:42:09 +0200 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-05-05 22:42:09 +0200 |
commit | 94d7f1a255db84233a2da70b27d9abf9c0a57135 (patch) | |
tree | 1caea28f70315117432636945607d1eb2b772df7 /drivers/infiniband/ulp | |
parent | RDMA/i40iw: Fix for removing quad hash entries (diff) | |
parent | IB/hfi1: Serialize hrtimer function calls (diff) | |
parent | RDMA/iw_cxgb4: remove abort_connection() usage from ep_timeout() (diff) | |
download | linux-94d7f1a255db84233a2da70b27d9abf9c0a57135.tar.xz linux-94d7f1a255db84233a2da70b27d9abf9c0a57135.zip |
Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7