Merge branches 'amso1100', 'cma', 'cxgb4', 'fdr', 'ipath', 'misc', 'mlx4', 'mthca...

author Roland Dreier <roland@purestorage.com>

Tue, 11 Oct 2011 19:56:31 +0000 (12:56 -0700)

committer Roland Dreier <roland@purestorage.com>

Tue, 11 Oct 2011 19:56:31 +0000 (12:56 -0700)
author Roland Dreier <roland@purestorage.com>
Tue, 11 Oct 2011 19:56:31 +0000 (12:56 -0700)
committer Roland Dreier <roland@purestorage.com>
Tue, 11 Oct 2011 19:56:31 +0000 (12:56 -0700)
diff --cc drivers/infiniband/core/cma.c
Simple merge
diff --cc drivers/infiniband/hw/nes/nes_cm.c
Simple merge
diff --cc drivers/infiniband/hw/nes/nes_cm.h
Simple merge
diff --cc drivers/infiniband/hw/nes/nes_verbs.h
Simple merge
author	Roland Dreier <roland@purestorage.com>
	Tue, 11 Oct 2011 19:56:31 +0000 (12:56 -0700)
committer	Roland Dreier <roland@purestorage.com>
	Tue, 11 Oct 2011 19:56:31 +0000 (12:56 -0700)
		1	2	3	4	5	6	7	8	9
drivers/infiniband/core/cma.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/infiniband/hw/nes/nes_cm.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/infiniband/hw/nes/nes_cm.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/infiniband/hw/nes/nes_verbs.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history