tree 44af103c5457b4c2286400158dcfc18846a7c4f0
parent dcd6c92267155e70a94b3927bce681ce74b80d1f
parent acbbb76a26648dfae6fed0989879e40d75692bfc
author Linus Torvalds <torvalds@linux-foundation.org> 1327337989 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1327337989 -0800

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