From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2011 10:13:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: latest~4
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=8864f5ee12d03afe269edeeae440744f53ea4af1;p=karo-tx-linux.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: fix cifsConvertToUCS() for the mapchars case
  cifs: add fallback in is_path_accessible for old servers
---

8864f5ee12d03afe269edeeae440744f53ea4af1