Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 13 Jan 2006 23:29:07 +0000 (15:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 13 Jan 2006 23:29:07 +0000 (15:29 -0800)

Trivial merge