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

Trivial merge