| commit | 43f63c8711ce02226b7bbdafeba7b8031faf3fb4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 04 18:37:09 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 04 18:37:09 2012 -0700 |
| tree | b279ac78cc010464a8c757f352303511a87b855d | |
| 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