Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma...

author Roland Dreier <roland@purestorage.com>

Mon, 21 May 2012 16:00:47 +0000 (09:00 -0700)

committer Roland Dreier <roland@purestorage.com>

Mon, 21 May 2012 16:00:47 +0000 (09:00 -0700)
author Roland Dreier <roland@purestorage.com>
Mon, 21 May 2012 16:00:47 +0000 (09:00 -0700)
committer Roland Dreier <roland@purestorage.com>
Mon, 21 May 2012 16:00:47 +0000 (09:00 -0700)
diff --cc drivers/infiniband/core/uverbs_cmd.c
Simple merge
diff --cc drivers/infiniband/core/verbs.c
Simple merge
diff --cc drivers/infiniband/hw/mlx4/qp.c
Simple merge
diff --cc include/rdma/ib_verbs.h
Simple merge
author	Roland Dreier <roland@purestorage.com>
	Mon, 21 May 2012 16:00:47 +0000 (09:00 -0700)
committer	Roland Dreier <roland@purestorage.com>
	Mon, 21 May 2012 16:00:47 +0000 (09:00 -0700)
		1	2	3	4	5	6	7	8	9	10
drivers/infiniband/core/uverbs_cmd.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
drivers/infiniband/core/verbs.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
drivers/infiniband/hw/mlx4/qp.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
include/rdma/ib_verbs.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history