diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 18:37:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 18:37:09 -0700 |
| commit | 43f63c8711ce02226b7bbdafeba7b8031faf3fb4 (patch) | |
| tree | b279ac78cc010464a8c757f352303511a87b855d /kernel/trace/blktrace.c | |
| parent | 6c216ec636f75d834461be15f83ec41a6759bd2b (diff) | |
| parent | e4b41fb9dafb9af4fecb602bf73d858ab651eeed (diff) | |
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/trace/blktrace.c')
0 files changed, 0 insertions, 0 deletions