From: Steve French <sfrench@us.ibm.com>
Date: Wed, 18 Jan 2012 21:12:04 +0000 (-0600)
Subject: Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=34f598ca0803f399da3438df46c7f56bfe423789;p=~shefty%2Frdma-dev.git

Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
---

34f598ca0803f399da3438df46c7f56bfe423789