diff options
author | Doug Ledford <dledford@redhat.com> | 2017-07-27 02:13:33 +0200 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-07-27 02:13:33 +0200 |
commit | f55c1e6608bed7f583f5be4a74bbca16b288a7e5 (patch) | |
tree | efb77a548ab0bff0a82439999b3adef0983cafe2 /drivers/infiniband/hw/mlx4 | |
parent | Merge branch 'hfi1' into k.o/for-4.14 (diff) | |
parent | IB/rxe: Constify static rxe_vm_ops (diff) | |
parent | IB/mlx4: Expose RSS capabilities (diff) | |
download | linux-f55c1e6608bed7f583f5be4a74bbca16b288a7e5.tar.xz linux-f55c1e6608bed7f583f5be4a74bbca16b288a7e5.zip |
Merge branches 'rxe' and 'mlx' into k.o/for-next