Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Wed, 1 Feb 2006 05:37:33 +0000 (21:37 -0800)]

Trivial merge