Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'ocrdma...

author Roland Dreier <roland@purestorage.com>

Thu, 23 Jan 2014 07:24:13 +0000 (23:24 -0800)

committer Roland Dreier <roland@purestorage.com>

Thu, 23 Jan 2014 07:24:13 +0000 (23:24 -0800)
author Roland Dreier <roland@purestorage.com>
Thu, 23 Jan 2014 07:24:13 +0000 (23:24 -0800)
committer Roland Dreier <roland@purestorage.com>
Thu, 23 Jan 2014 07:24:13 +0000 (23:24 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc include/rdma/ib_verbs.h
Simple merge
author	Roland Dreier <roland@purestorage.com>
	Thu, 23 Jan 2014 07:24:13 +0000 (23:24 -0800)
committer	Roland Dreier <roland@purestorage.com>
	Thu, 23 Jan 2014 07:24:13 +0000 (23:24 -0800)
		1	2	3	4	5	6	7	8	9	10	11
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	diff11 \|	blob \| history
include/rdma/ib_verbs.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	diff11 \|	blob \| history