Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <[email protected]>
Tue, 31 Jan 2006 23:22:29 +0000 (15:22 -0800)
committerLinus Torvalds <[email protected]>
Tue, 31 Jan 2006 23:22:29 +0000 (15:22 -0800)

Trivial merge