From: Linus Torvalds Date: Fri, 4 Nov 2011 04:07:58 +0000 (-0700) Subject: Merge git://git.samba.org/sfrench/cifs-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a67a573b8d9f02211f36fbab50f6265dc49384a;p=linux-beck.git 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 --- 1a67a573b8d9f02211f36fbab50f6265dc49384a