Merge branches 'cma', 'cxgb3', 'cxgb4', 'misc', 'nes', 'netlink', 'srp' and 'uverbs...

author Roland Dreier <roland@purestorage.com>

Wed, 25 May 2011 20:47:20 +0000 (13:47 -0700)

committer Roland Dreier <roland@purestorage.com>

Wed, 25 May 2011 20:47:20 +0000 (13:47 -0700)
author Roland Dreier <roland@purestorage.com>
Wed, 25 May 2011 20:47:20 +0000 (13:47 -0700)
committer Roland Dreier <roland@purestorage.com>
Wed, 25 May 2011 20:47:20 +0000 (13:47 -0700)
diff --cc drivers/infiniband/core/ucma.c
Simple merge
author	Roland Dreier <roland@purestorage.com>
	Wed, 25 May 2011 20:47:20 +0000 (13:47 -0700)
committer	Roland Dreier <roland@purestorage.com>
	Wed, 25 May 2011 20:47:20 +0000 (13:47 -0700)