From: Patrick McHardy <kaber@trash.net>
Date: Thu, 16 Jun 2011 15:01:10 +0000 (+0200)
Subject: Merge branch 'master' of /repos/git/net-next-2.6
X-Git-Tag: v3.1-rc1~316^2~451
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3;p=~emulex%2Finfiniband.git

Merge branch 'master' of /repos/git/net-next-2.6
---

1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3