From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jan 2012 16:59:49 +0000 (-0800)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7908b3ef6809e49c77d914342dfaa4b946476d7a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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
---

7908b3ef6809e49c77d914342dfaa4b946476d7a