| commit | 33656a1f2ee5346c742d63ddd0e0970c95a56b70 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 02 09:59:57 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 02 09:59:57 2016 -0700 |
| tree | 86570d7725e5a95626bf34c3d257e21cfdae93da | |
| parent | 5f40adbc3eebd7e1c55ec87315e762924a36fe76 [diff] | |
| parent | c26f6c61578852f679787d555e6d07804e1f5f14 [diff] |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/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