tree eb4eee66ed54915fab3e75781affbefb402d6a11
parent 1737ef7598d3515fdc11cb9ba7e054f334404e04
parent a9ac49d303f967be0dabd97cb722c4a13109c6c2
author Linus Torvalds <torvalds@linux-foundation.org> 1233282074 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233282074 -0800

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: make sure we allocate enough storage for socket address
  [CIFS] Make socket retry timeouts consistent between blocking and nonblocking cases
  [CIFS] some cleanup to dir.c prior to addition of posix_open
  [CIFS] revalidate parent inode when rmdir done within that directory
  [CIFS] Rename md5 functions to avoid collision with new rt modules
  cifs: turn smb_send into a wrapper around smb_sendv