| commit | 7908b3ef6809e49c77d914342dfaa4b946476d7a | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 23 Jan 2012 16:59:49 +0000 (23 08:59 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 23 Jan 2012 16:59:49 +0000 (23 08:59 -0800) | ||
| tree | 44af103c5457b4c2286400158dcfc18846a7c4f0 | treesnapshot (tar.gz zip) |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f | commitdiff |
| parent | acbbb76a26648dfae6fed0989879e40d75692bfc | commitdiff |
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6:
CIFS: Rename *UCS* functions to *UTF16*
[CIFS] ACL and FSCACHE support no longer EXPERIMENTAL
[CIFS] Fix build break with multiuser patch when LANMAN disabled
cifs: warn about impending deprecation of legacy MultiuserMount code
cifs: fetch credentials out of keyring for non-krb5 auth multiuser mounts
cifs: sanitize username handling
keys: add a "logon" key type
cifs: lower default wsize when unix extensions are not used
cifs: better instrumentation for coalesce_t2
cifs: integer overflow in parse_dacl()
cifs: Fix sparse warning when calling cifs_strtoUCS
CIFS: Add descriptions to the brlock cache functions
* git://git.samba.org/sfrench/cifs-2.6:
CIFS: Rename *UCS* functions to *UTF16*
[CIFS] ACL and FSCACHE support no longer EXPERIMENTAL
[CIFS] Fix build break with multiuser patch when LANMAN disabled
cifs: warn about impending deprecation of legacy MultiuserMount code
cifs: fetch credentials out of keyring for non-krb5 auth multiuser mounts
cifs: sanitize username handling
keys: add a "logon" key type
cifs: lower default wsize when unix extensions are not used
cifs: better instrumentation for coalesce_t2
cifs: integer overflow in parse_dacl()
cifs: Fix sparse warning when calling cifs_strtoUCS
CIFS: Add descriptions to the brlock cache functions
| security/keys/user_defined.c | diff1 | diff2 | blobhistory |