From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Thu, 19 May 2005 10:54:00 +0000 (+0100)
Subject: Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.14-rc2~49^2~52
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7063e6c717f6108c4b3fc3135a516c86ef944870;p=~shefty%2Frdma-dev.git

Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
---

7063e6c717f6108c4b3fc3135a516c86ef944870