diff options
author | Doug Ledford <dledford@redhat.com> | 2016-08-04 02:58:45 +0200 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-08-04 02:58:45 +0200 |
commit | 3e5e8e8a9a059c15881abd582edcaf4d2f736caf (patch) | |
tree | ac545a54cddafdacae7387885b62e342fe982906 /drivers/infiniband/hw/cxgb4 | |
parent | Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8 (diff) | |
parent | iw_cm: free cm_id resources on the last deref (diff) | |
parent | IB/mlx5: Fix port counter ID association to QP offset (diff) | |
download | linux-3e5e8e8a9a059c15881abd582edcaf4d2f736caf.tar.xz linux-3e5e8e8a9a059c15881abd582edcaf4d2f736caf.zip |
Merge branches 'cxgb4' and 'mlx5' into k.o/for-4.8