From: Karel Zak Date: Thu, 11 May 2017 08:59:14 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/pali/util-linux X-Git-Tag: v2.30-rc1~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce59d8bfa596262aba128a220d33d9a14646f9d6;p=thirdparty%2Futil-linux.git Merge branch 'master' of https://github.com/pali/util-linux * 'master' of https://github.com/pali/util-linux: tests: Add UDF CD-ROM hybrid image (ISO+Joliet+UDF) created by Nero 6 tests: Fix test output for low-probe-udf to contain UDF data Revert "libblkid: Probe UDF volumes for ISO9660 info as well" --- ce59d8bfa596262aba128a220d33d9a14646f9d6