Merge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Sep 2005 20:21:35 +0000 (13:21 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Sep 2005 20:21:35 +0000 (13:21 -0700)

Trivial merge