From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Dec 2010 16:49:15 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.37-rc6~35
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=caa4a59574a39e6574664e82b92455d41eca27a8;p=~emulex%2Finfiniband.git

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
---

caa4a59574a39e6574664e82b92455d41eca27a8