diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-22 17:08:25 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-22 17:08:25 +0200 |
commit | 75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4 (patch) | |
tree | b9080999d2fbe38aa1242ac4b838e17ebf1ed656 /include/asm-x86/resume-trace.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | [CIFS] Fix reversed memset arguments (diff) | |
download | linux-75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4.tar.xz linux-75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4.zip |
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
Diffstat (limited to 'include/asm-x86/resume-trace.h')
0 files changed, 0 insertions, 0 deletions