projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f40adb c26f6c6)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 May 2016 16:59:57 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 May 2016 16:59:57 +0000 (09:59 -0700)
commit33656a1f2ee5346c742d63ddd0e0970c95a56b70
tree86570d7725e5a95626bf34c3d257e21cfdae93datree | snapshot
parent5f40adbc3eebd7e1c55ec87315e762924a36fe76commit | diff
parentc26f6c61578852f679787d555e6d07804e1f5f14commit | diff
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull UDF fix from Jan Kara:
 "A fix of a regression in UDF that got introduced in 4.6-rc1 by one of
  the charset encoding fixes"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Fix conversion of 'dstring' fields to UTF8
John Crispins staging tree