diff options
| author | Doug Ledford | 2017-07-26 20:13:33 -0400 |
|---|---|---|
| committer | Doug Ledford | 2017-07-26 20:13:33 -0400 |
| commit | f55c1e6608bed7f583f5be4a74bbca16b288a7e5 (patch) | |
| tree | efb77a548ab0bff0a82439999b3adef0983cafe2 /drivers/infiniband/sw | |
| parent | 03da084ed8804ddc5918883be84245b53393b8fb (diff) | |
| parent | b4fbec9673db22dcd3cea7ce04148af39fe19e12 (diff) | |
| parent | 6afff1c7152f6f0787d7ad5de2e124f8643f0a45 (diff) | |
Merge branches 'rxe' and 'mlx' into k.o/for-next