From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Jul 2011 18:12:21 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=070f944a0bb9dd27772fa232bd7648ccc5780548;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: set socket send and receive timeouts before attempting connect
---

070f944a0bb9dd27772fa232bd7648ccc5780548