Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 Aug 2005 16:20:23 +0000 (09:20 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 Aug 2005 16:20:23 +0000 (09:20 -0700)

Trivial merge