diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-22 11:08:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-22 11:08:25 -0400 |
| commit | 75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4 (patch) | |
| tree | b9080999d2fbe38aa1242ac4b838e17ebf1ed656 /fs/locks.c | |
| parent | a0abb93bf9dc590b031a1123f3e6c6c225c1cdd1 (diff) | |
| parent | 0a891adccc867c28b022128bc342a779e476c816 (diff) | |
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 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions