diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 13:54:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 13:54:29 -0700 |
commit | d21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c (patch) | |
tree | 52f56530c57b8029f24fb254aa4727fdd9217bc8 /fs/nls/nls_ascii.c | |
parent | 467701e2862454b25e6cdf1171e0cea88ed5f21d (diff) | |
parent | 83fb086e0ecd879a4676cf12fc7afc1f9ecd1784 (diff) | |
download | op-kernel-dev-d21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c.zip op-kernel-dev-d21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c.tar.gz |
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: trivial: add space in fsc error message
cifs: silence printk when establishing first session on socket
CIFS ACL support needs CONFIG_KEYS, so depend on it
possible memory corruption in cifs_parse_mount_options()
cifs: make CIFS depend on CRYPTO_ECB
cifs: fix the kernel release version in the default security warning message
Diffstat (limited to 'fs/nls/nls_ascii.c')
0 files changed, 0 insertions, 0 deletions