From: Jeff Garzik <jgarzik@pobox.com>
Date: Sat, 5 Nov 2005 19:38:55 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Tag: v2.6.15-rc1~721^2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=328198acb7407301ddf6005c0fa1e04bd0c539c8;p=~emulex%2Finfiniband.git

Merge branch 'master'
---

328198acb7407301ddf6005c0fa1e04bd0c539c8