]> git.proxmox.com Git - mirror_zfs-debian.git/commit - debian/tree/zfsutils-linux/usr/share/initramfs-tools/hooks/zdev
Merge tag 'upstream/0.6.5.11'
authorAron Xu <aron@debian.org>
Fri, 14 Jul 2017 08:30:36 +0000 (16:30 +0800)
committerAron Xu <aron@debian.org>
Fri, 14 Jul 2017 08:30:36 +0000 (16:30 +0800)
commit0f1c2db73e57a7828ebb2a93b2547a1a314e6992
treea8efa26726d90b2859a55af2c47fcecef25221bc
parentc4fd3ee79845ea461309aae4be8cc7421d3ca6db
parent3d248aec65cf20346057276b5973b3fdcb5f9395
Merge tag 'upstream/0.6.5.11'

Upstream version 0.6.5.11

Conflicts:
META
config/config.guess
config/config.sub
config/install-sh
config/libtool.m4
config/ltmain.sh
configure
lib/libzfs/libzfs.pc
lib/libzfs/libzfs_core.pc
rpm/generic/zfs-kmod.spec.in
rpm/generic/zfs.spec.in
rpm/redhat/zfs.spec.in