From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 2 Nov 2005 16:06:02 +0000 (-0800)
Subject: Merge git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.15-rc1~18^2~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ec1890c5df451799dec969a3581ff72e1934b5ee;p=~shefty%2Frdma-dev.git

Merge git://brick.kernel.dk/data/git/linux-2.6-block
---

ec1890c5df451799dec969a3581ff72e1934b5ee