Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

author Roland Dreier <rolandd@cisco.com>

Fri, 28 Oct 2005 22:50:51 +0000 (15:50 -0700)

committer Roland Dreier <rolandd@cisco.com>

Fri, 28 Oct 2005 22:50:51 +0000 (15:50 -0700)
author Roland Dreier <rolandd@cisco.com>
Fri, 28 Oct 2005 22:50:51 +0000 (15:50 -0700)
committer Roland Dreier <rolandd@cisco.com>
Fri, 28 Oct 2005 22:50:51 +0000 (15:50 -0700)
diff --cc drivers/infiniband/hw/mthca/mthca_cmd.c
Simple merge
diff --cc drivers/infiniband/hw/mthca/mthca_memfree.c
Simple merge
diff --cc drivers/infiniband/hw/mthca/mthca_memfree.h
Simple merge
author	Roland Dreier <rolandd@cisco.com>
	Fri, 28 Oct 2005 22:50:51 +0000 (15:50 -0700)
committer	Roland Dreier <rolandd@cisco.com>
	Fri, 28 Oct 2005 22:50:51 +0000 (15:50 -0700)
		1	2
drivers/infiniband/hw/mthca/mthca_cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mthca/mthca_memfree.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mthca/mthca_memfree.h	patch \|	diff1 \|	diff2 \|	blob \| history