Merge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4', 'mthca' and 'qib' into...

author Roland Dreier <roland@purestorage.com>

Mon, 3 Oct 2011 18:16:08 +0000 (11:16 -0700)

committer Roland Dreier <roland@purestorage.com>

Mon, 3 Oct 2011 18:16:08 +0000 (11:16 -0700)
author Roland Dreier <roland@purestorage.com>
Mon, 3 Oct 2011 18:16:08 +0000 (11:16 -0700)
committer Roland Dreier <roland@purestorage.com>
Mon, 3 Oct 2011 18:16:08 +0000 (11:16 -0700)
diff --cc drivers/infiniband/core/cma.c
Simple merge
author	Roland Dreier <roland@purestorage.com>
	Mon, 3 Oct 2011 18:16:08 +0000 (11:16 -0700)
committer	Roland Dreier <roland@purestorage.com>
	Mon, 3 Oct 2011 18:16:08 +0000 (11:16 -0700)