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)
1  2  3  4 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge