tree b9080999d2fbe38aa1242ac4b838e17ebf1ed656
parent a0abb93bf9dc590b031a1123f3e6c6c225c1cdd1
parent 0a891adccc867c28b022128bc342a779e476c816
author Linus Torvalds <torvalds@linux-foundation.org> 1211468905 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211468905 -0700

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 reversed memset arguments
  Adds username in the upcall key for unattended mounts with keytab
  [CIFS] Remove redundant NULL check