Merge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 17:16:07 +0000 (10:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 17:16:07 +0000 (10:16 -0700)

Trivial merge