diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-05 03:37:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-05 03:37:09 +0200 |
commit | 43f63c8711ce02226b7bbdafeba7b8031faf3fb4 (patch) | |
tree | b279ac78cc010464a8c757f352303511a87b855d /kernel | |
parent | Merge tag 'for_linus-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | Fix UNC parsing on mount (diff) | |
download | linux-43f63c8711ce02226b7bbdafeba7b8031faf3fb4.tar.xz linux-43f63c8711ce02226b7bbdafeba7b8031faf3fb4.zip |
Merge git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French.
* git://git.samba.org/sfrench/cifs-2.6:
Fix UNC parsing on mount
Remove unnecessary check for NULL in password parser
CIFS: Fix VFS lock usage for oplocked files
Revert "CIFS: Fix VFS lock usage for oplocked files"
cifs: writing past end of struct in cifs_convert_address()
cifs: silence compiler warnings showing up with gcc-4.7.0
CIFS: Fix VFS lock usage for oplocked files
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions