diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 16:47:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 16:47:31 -0400 |
| commit | 57675e6e75c18f279b944dc2397cc9fd0053845e (patch) | |
| tree | 2e478084ad1985d424627a3d51584042a9dfef5a /fs/lockd/clntlock.c | |
| parent | 02f370506822cbff60bbf5b685053fa2e8640811 (diff) | |
| parent | a7f796a60bb5dcdc154c3ae04d484a395a60809f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Fix typo in previous commit
[CIFS] Fix define for new proxy cap to match documentation
[CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash
[CIFS] Reserve new proxy cap for WAFS
[CIFS] Add various missing flags and defintions
[CIFS] make cifs_dfs_automount_list_static
[CIFS] Fix oops when slow oplock process races with unmount
[CIFS] Fix acl length when very short ACL being modified by chmod
[CIFS] Fix looping on reconnect to Samba when unexpected tree connect fail on reconnect
[CIFS] minor update to change log
Diffstat (limited to 'fs/lockd/clntlock.c')
0 files changed, 0 insertions, 0 deletions