Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
commit3aec46c1e0be28ead67f53c2cade6453a7fba6e6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Feb 2011 00:29:50 +0000 (11 16:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Feb 2011 00:29:50 +0000 (11 16:29 -0800)
tree71e697fb2639013d394c2580669daf10319b4f29
parent68c3d4b26623e92656588061405d9dbdf97c0706
parent71823baff1978be892e7a36eddf6170e1cc6650d
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: don't always drop malformed replies on the floor (try #3)
  cifs: clean up checks in cifs_echo_request
  [CIFS] Do not send SMBEcho requests on new sockets until SMBNegotiate