From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4;p=linux-beck.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