projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f12a20f 11379b5)
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)
* 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


Trivial merge
John Crispins staging tree