Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
commit75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 May 2008 15:08:25 +0000 (22 08:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 May 2008 15:08:25 +0000 (22 08:08 -0700)
treeb9080999d2fbe38aa1242ac4b838e17ebf1ed656
parenta0abb93bf9dc590b031a1123f3e6c6c225c1cdd1
parent0a891adccc867c28b022128bc342a779e476c816
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Fix reversed memset arguments
  Adds username in the upcall key for unattended mounts with keytab
  [CIFS] Remove redundant NULL check