From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 May 2016 16:59:57 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: Ubuntu-5.0.0-8.9~7353
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=33656a1f2ee5346c742d63ddd0e0970c95a56b70;p=mirror_ubuntu-disco-kernel.git

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

33656a1f2ee5346c742d63ddd0e0970c95a56b70