Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Jul 2011 18:12:21 +0000 (11:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Jul 2011 18:12:21 +0000 (11:12 -0700)
commit070f944a0bb9dd27772fa232bd7648ccc5780548
tree9efa45dff3e8d61e2c8ab7c6caa3bc53cfe44b8e
parentb775c389252886b64f037a655934fa1df7c03006
parentee1b3ea9e6171d7a842527a44873f9f51e6f239b
Merge git://git./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