tree 9efa45dff3e8d61e2c8ab7c6caa3bc53cfe44b8e
parent b775c389252886b64f037a655934fa1df7c03006
parent ee1b3ea9e6171d7a842527a44873f9f51e6f239b
author Linus Torvalds <torvalds@linux-foundation.org> 1309716741 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1309716741 -0700

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