Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next

author Roland Dreier <rolandd@cisco.com>

Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)

committer Roland Dreier <rolandd@cisco.com>

Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)
author Roland Dreier <rolandd@cisco.com>
Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)
committer Roland Dreier <rolandd@cisco.com>
Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)
diff --cc drivers/infiniband/ulp/srp/ib_srp.c
Simple merge
author	Roland Dreier <rolandd@cisco.com>
	Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)
committer	Roland Dreier <rolandd@cisco.com>
	Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)