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)

Trivial merge