From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 26 Apr 2005 15:58:22 +0000 (-0700)
Subject: Automatic merge of kernel.org:/home/rmk/linux-2.6-rmk.git
X-Git-Tag: v2.6.12-rc4~202
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1e14c33fe2e3409d9f34041859af52be6e4723af;p=~shefty%2Frdma-dev.git

Automatic merge of kernel.org:/home/rmk/linux-2.6-rmk.git
---

1e14c33fe2e3409d9f34041859af52be6e4723af