| commit | caa4a59574a39e6574664e82b92455d41eca27a8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 14 08:49:15 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 14 08:49:15 2010 -0800 |
| tree | a5f67a97bf15c15ed62661ca9924e3e19081a282 | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 [diff] | |
| parent | 545c988b2018a593f24d291b66776a0d08525acd [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: remove bogus remapping of error in cifs_filldir() cifs: allow calling cifs_build_path_to_root on incomplete cifs_sb cifs: fix check of error return from is_path_accessable cifs: remove Local_System_Name cifs: fix use of CONFIG_CIFS_ACL cifs: add attribute cache timeout (actimeo) tunable