]> git.proxmox.com Git - mirror_zfs-debian.git/commit - module/zfs/zfs_vnops.c
projects / mirror_zfs-debian.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b21177 5eacc07)
Merge tag 'upstream/0.6.5.7'
authorAron Xu <aron@debian.org>
Tue, 31 May 2016 06:09:55 +0000 (14:09 +0800)
committerAron Xu <aron@debian.org>
Tue, 31 May 2016 06:09:55 +0000 (14:09 +0800)
commitfec6b0975dadccd102efbb43fe4cdf0a9456ba48
treed1b2c6389e229da6deff16101fc8e9dab0710084tree
parent7b211777933d1d7793bab0328f02e09f0bd82819commit | diff
parent5eacc075a6d5f568b95682994ca4ea7120a0fef9commit | diff
Merge tag 'upstream/0.6.5.7'

Upstream version 0.6.5.7

Conflicts:
META
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
zfs_config.h.in
Mirror of ZFSOnLinux for Debian