]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdb54837e29dfa0e540917e4a262797e916d5f7cb
tree9efa45dff3e8d61e2c8ab7c6caa3bc53cfe44b8e
parent3d61575869d49a49a42961bc772db1896e91a0fc
parent11505b4e8609956cc4eece4614896460cceb6368
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