git.cascardo.eti.br Git - cascardo/linux.git/commit

author	Doug Ledford <dledford@redhat.com>
	Wed, 16 Mar 2016 17:38:28 +0000 (13:38 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Wed, 16 Mar 2016 17:38:28 +0000 (13:38 -0400)
commit	d2ad9cc75963714d04d4596c226a499765950dbf
tree	383b46ca4f4006dede169e9be20bb06eb98c052b	tree \| snapshot
parent	76b06402796c46566ea3794a999f718f144d93d2	commit \| diff
parent	35d1901134e97cf95c0ab6ef70f5aead6cb34e9e	commit \| diff
parent	318d311e8f016dbbf22160d7b1c19a290a95ad9d	commit \| diff
parent	95f60bb8118c1fc368d7414409d555f050aea7f2	commit \| diff

Merge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6

Unnamed repository; edit this file 'description' to name the repository.

drivers/infiniband/core/cma.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/core/uverbs_cmd.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/core/verbs.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/cxgb4/iw_cxgb4.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/hw/mlx5/mlx5_ib.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/infiniband/ulp/iser/iser_verbs.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/linux/mlx5/device.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/rdma/ib_verbs.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history