summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-04 05:07:58 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-04 05:07:58 +0100
commit1a67a573b8d9f02211f36fbab50f6265dc49384a (patch)
tree8435c615c4afbbc1eb4e80ba7185778a00147929 /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentcifs: Assume passwords are encoded according to iocharset (try #2) (diff)
downloadlinux-1a67a573b8d9f02211f36fbab50f6265dc49384a.tar.xz
linux-1a67a573b8d9f02211f36fbab50f6265dc49384a.zip
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 'drivers')
0 files changed, 0 insertions, 0 deletions