From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 22 Aug 2006 18:42:36 +0000 (-0400)
Subject: Merge branch 'from-linus' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~60^2~31
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=69758820a42da207bdc775d6eccf1f9fb67cd62e;p=~emulex%2Finfiniband.git

Merge branch 'from-linus' into upstream
---

69758820a42da207bdc775d6eccf1f9fb67cd62e