Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2011 10:13:11 +0000 (03:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2011 10:13:11 +0000 (03:13 -0700)
commit8864f5ee12d03afe269edeeae440744f53ea4af1
tree0e1cc41695c6a25f3a56e43951f9c07e00c7a579
parentf12a20fc9bfba4218ecbc4e40c8e08dc2a85dc99
parent11379b5e33950048ad66825da7f462b0d0da9d73
Merge git://git./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