diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 04:07:58 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 04:07:58 (GMT) |
commit | 1a67a573b8d9f02211f36fbab50f6265dc49384a (patch) | |
tree | 8435c615c4afbbc1eb4e80ba7185778a00147929 /net/nfc/nci | |
parent | 6dbbd92522a13bcd5003829cbed30bc38a3d0362 (diff) | |
parent | 9ef5992e442b2b0bf6364bfcc5574e983a983159 (diff) | |
download | linux-fsl-qoriq-1a67a573b8d9f02211f36fbab50f6265dc49384a.tar.xz |
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6:
cifs: Assume passwords are encoded according to iocharset (try #2)
CIFS: Fix the VFS brlock cache usage in posix locking case
[CIFS] Update cifs version to 1.76
CIFS: Remove extra mutex_unlock in cifs_lock_add_if
Diffstat (limited to 'net/nfc/nci')
0 files changed, 0 insertions, 0 deletions