From: Karel Zak <kzak@redhat.com>
Date: Fri, 6 Mar 2015 09:53:22 +0000 (+0100)
Subject: Merge branch 'zfs' of https://github.com/mihu/util-linux
X-Git-Tag: v2.27-rc1~401
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f71ceb140d544ca1a28879ab20b2d32536f6e80;p=thirdparty%2Futil-linux.git

Merge branch 'zfs' of https://github.com/mihu/util-linux

* 'zfs' of https://github.com/mihu/util-linux:
  zfs: make less syscalls
  blkid: make zfs detection more robust
---

0f71ceb140d544ca1a28879ab20b2d32536f6e80