Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
commitcaa4a59574a39e6574664e82b92455d41eca27a8
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 16:49:15 +0000 (14 08:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 16:49:15 +0000 (14 08:49 -0800)
treea5f67a97bf15c15ed62661ca9924e3e19081a282
parent6313e3c21743cc88bb5bd8aa72948ee1e83937b6
parent545c988b2018a593f24d291b66776a0d08525acd
Merge git://git./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