Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 00:31:54 +0000 (16:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 00:31:54 +0000 (16:31 -0800)
commitba77df570c6710c9c19b31e0e48e4bcdf31cefe8
tree997c210135b5578982df256dd5a0140e04d972d1
parent602d4a7e2f4b843d1a67375d4d7104073495b758
parentd09e32764176b61c4afee9fd5e7fe04713bfa56f
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband
drivers/infiniband/hw/mthca/mthca_profile.c
drivers/infiniband/hw/mthca/mthca_qp.c