]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6
authorDoug Ledford <dledford@redhat.com>
Wed, 16 Mar 2016 17:38:28 +0000 (13:38 -0400)
committerDoug Ledford <dledford@redhat.com>
Wed, 16 Mar 2016 17:38:28 +0000 (13:38 -0400)
commitb836e203736f51fc76a3d338a1aed3999224b962
tree383b46ca4f4006dede169e9be20bb06eb98c052b
parentd384ff5ec1d147c88da9b4e09e6fe309d79b459b
parent60af1a2ca50557f4c1a0ae3657791a13848b75ba
parentb66d32e6c0beb5ad309afc22c9639006dd55c19c
parent3638900f329bbd4a537b5a7d0b81257ea0a568b9
Merge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6
drivers/infiniband/core/cma.c
drivers/infiniband/core/uverbs_cmd.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/ulp/iser/iser_verbs.c
include/linux/mlx5/device.h
include/linux/mlx5/mlx5_ifc.h
include/rdma/ib_verbs.h