Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 17:36:48 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 17:36:48 +0000 (10:36 -0700)

Trivial merge