tree 496e32e4976d59d3ddd06852af5fbc5b2831ea68
parent 3050d45caded2d9fb8170547d08c389122c6c5d5
parent 2b83457bded19cb57c5bdd59ebe16fe1a919c088
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1196133637 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1196133637 -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] Fix check after use error in ACL code
  [CIFS] Fix potential data corruption when writing out cached dirty pages
  [CIFS] Fix spurious reconnect on 2nd peek from read of SMB length
  [CIFS] remove build warning
  [CIFS] Have CIFS_SessSetup build correct SPNEGO SessionSetup request
  [CIFS] minor checkpatch cleanup
  [CIFS] have cifs_get_spnego_key get the hostname from TCP_Server_Info
  [CIFS] add hostname field to TCP_Server_Info struct
  [CIFS] clean up error handling in cifs_mount
  [CIFS] add ver= prefix to upcall format version
  [CIFS] Fix buffer overflow if server sends corrupt response to small