Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Nov 2011 04:07:58 +0000 (21:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Nov 2011 04:07:58 +0000 (21:07 -0700)
commit1a67a573b8d9f02211f36fbab50f6265dc49384a
tree8435c615c4afbbc1eb4e80ba7185778a00147929
parent6dbbd92522a13bcd5003829cbed30bc38a3d0362
parent9ef5992e442b2b0bf6364bfcc5574e983a983159
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