Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 23:47:34 +0000 (16:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 23:47:34 +0000 (16:47 -0700)

Trivial merge