summaryrefslogtreecommitdiff
path: root/staging/syslog.c
AgeCommit message (Expand)AuthorFilesLines
2013-05-13staging: add mausezahn staging directoryDaniel Borkmann1-0/+248
;torvalds@linux-foundation.org>2016-05-02 09:59:57 -0700 committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-02 09:59:57 -0700 commit33656a1f2ee5346c742d63ddd0e0970c95a56b70 (patch) tree86570d7725e5a95626bf34c3d257e21cfdae93da parent5f40adbc3eebd7e1c55ec87315e762924a36fe76 (diff)parentc26f6c61578852f679787d555e6d07804e1f5f14 (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
Diffstat