From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 May 2008 15:08:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.26-rc4~69
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4;p=linux-2.6-omap-h63xx.git

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
---

75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4