Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
commitea48e705be4f886c16313c882a6623b442bab0eb
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 Aug 2005 16:20:23 +0000 (4 09:20 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 Aug 2005 16:20:23 +0000 (4 09:20 -0700)
tree4845014ed6cc478b245d9045b8ea1d8c7b6149ad
parent6e346228c76506e07e297744a28464022c6806ad
parent0dca0f7bf82face7b700890318d5550fd542cabf
Merge head 'for-linus' of /linux/kernel/git/roland/infiniband