]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'master' of https://github.com/pali/util-linux
authorKarel Zak <kzak@redhat.com>
Thu, 11 May 2017 08:59:14 +0000 (10:59 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 11 May 2017 08:59:14 +0000 (10:59 +0200)
* '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"


Trivial merge