diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-02 09:59:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-02 09:59:57 -0700 |
commit | 33656a1f2ee5346c742d63ddd0e0970c95a56b70 (patch) | |
tree | 86570d7725e5a95626bf34c3d257e21cfdae93da /arch/sparc/include/asm/head_32.h | |
parent | Merge tag 'gpio-v4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio (diff) | |
parent | udf: Fix conversion of 'dstring' fields to UTF8 (diff) | |
download | linux-dev-33656a1f2ee5346c742d63ddd0e0970c95a56b70.tar.xz linux-dev-33656a1f2ee5346c742d63ddd0e0970c95a56b70.zip |
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
Diffstat (limited to 'arch/sparc/include/asm/head_32.h')
0 files changed, 0 insertions, 0 deletions