Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

author Linus Torvalds <torvalds@g5.osdl.org>

Thu, 10 Nov 2005 21:27:06 +0000 (13:27 -0800)

committer Linus Torvalds <torvalds@g5.osdl.org>

Thu, 10 Nov 2005 21:27:06 +0000 (13:27 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 21:27:06 +0000 (13:27 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 21:27:06 +0000 (13:27 -0800)
diff --cc drivers/infiniband/core/verbs.c
Simple merge
diff --cc drivers/infiniband/hw/mthca/mthca_catas.c
Simple merge
diff --cc drivers/infiniband/hw/mthca/mthca_srq.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 10 Nov 2005 21:27:06 +0000 (13:27 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 10 Nov 2005 21:27:06 +0000 (13:27 -0800)
		1	2
drivers/infiniband/core/verbs.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mthca/mthca_catas.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mthca/mthca_srq.c	patch \|	diff1 \|	diff2 \|	blob \| history