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)
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


Trivial merge