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

author Linus Torvalds <[email protected]>

Sat, 5 Nov 2005 00:31:54 +0000 (16:31 -0800)

committer Linus Torvalds <[email protected]>

Sat, 5 Nov 2005 00:31:54 +0000 (16:31 -0800)
author Linus Torvalds <[email protected]>
Sat, 5 Nov 2005 00:31:54 +0000 (16:31 -0800)
committer Linus Torvalds <[email protected]>
Sat, 5 Nov 2005 00:31:54 +0000 (16:31 -0800)
diff --cc drivers/infiniband/hw/mthca/mthca_profile.c
Simple merge
diff --cc drivers/infiniband/hw/mthca/mthca_qp.c
Simple merge
author	Linus Torvalds <[email protected]>
	Sat, 5 Nov 2005 00:31:54 +0000 (16:31 -0800)
committer	Linus Torvalds <[email protected]>
	Sat, 5 Nov 2005 00:31:54 +0000 (16:31 -0800)
		1	2
drivers/infiniband/hw/mthca/mthca_profile.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mthca/mthca_qp.c	patch \|	diff1 \|	diff2 \|	blob \| history