Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 21:27:06 +0000 (13:27 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 21:27:06 +0000 (13:27 -0800)

Trivial merge