| commit | 1a67a573b8d9f02211f36fbab50f6265dc49384a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 03 21:07:58 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 03 21:07:58 2011 -0700 |
| tree | 8435c615c4afbbc1eb4e80ba7185778a00147929 | |
| parent | 6dbbd92522a13bcd5003829cbed30bc38a3d0362 [diff] | |
| parent | 9ef5992e442b2b0bf6364bfcc5574e983a983159 [diff] |
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