| commit | 070f944a0bb9dd27772fa232bd7648ccc5780548 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 03 11:12:21 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 03 11:12:21 2011 -0700 |
| tree | 9efa45dff3e8d61e2c8ab7c6caa3bc53cfe44b8e | |
| parent | b775c389252886b64f037a655934fa1df7c03006 [diff] | |
| parent | ee1b3ea9e6171d7a842527a44873f9f51e6f239b [diff] |
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