Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Sep 2010 19:47:08 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Sep 2010 19:47:08 +0000 (12:47 -0700)
commited8f425f546a2242a97f61fabcbe9e50a2559a19
tree5e580d4c654191b73fc5981785ebf1e52e575b4a
parent1421e98662f1cab802e0fa39d16b8dc6b874a4eb
parent32670396e7fc6e4f37451a69339968985461a374
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: prevent possible memory corruption in cifs_demultiplex_thread
  cifs: eliminate some more premature cifsd exits
  cifs: prevent cifsd from exiting prematurely
  [CIFS] ntlmv2/ntlmssp remove-unused-function CalcNTLMv2_partial_mac_key
  cifs: eliminate redundant xdev check in cifs_rename
  Revert "[CIFS] Fix ntlmv2 auth with ntlmssp"
  Revert "missing changes during ntlmv2/ntlmssp auth and sign"
  Revert "Eliminate sparse warning - bad constant expression"
  Revert "[CIFS] Eliminate unused variable warning"