Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 May 2008 15:08:25 +0000 (08:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 May 2008 15:08:25 +0000 (08:08 -0700)
* 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


Trivial merge