Merge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Sun, 11 Sep 2005 17:16:07 +0000 (10:16 -0700)]

Trivial merge