Merge branch 'srp' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 00:32:36 +0000 (16:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 00:32:36 +0000 (16:32 -0800)
commit127f2fa31ac624c744f3767363c4919209980956
tree972b7ffbcd2c846bbb34879efb91e324dc0677be
parentba77df570c6710c9c19b31e0e48e4bcdf31cefe8
parentaef9ec39c47f0cece886ddd6b53c440321e0b2a6
Merge branch 'srp' of /linux/kernel/git/roland/infiniband