]> git.proxmox.com Git - mirror_zfs-debian.git/commit - debian/control
projects / mirror_zfs-debian.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68d4f68 94a4099)
Merge tag 'upstream/0.6.5.4'
authorAron Xu <aron@debian.org>
Sun, 10 Jan 2016 12:20:04 +0000 (20:20 +0800)
committerAron Xu <aron@debian.org>
Sun, 10 Jan 2016 12:20:04 +0000 (20:20 +0800)
commit32e517a0af5ef160b0904a54fa047b3523800b87
tree2925095bedacce8d9d823468206afcad2b7bbc10tree
parent68d4f68ba10b0c244a1bd685f3b22932e96bfb4acommit | diff
parent94a40997a3cce64d8f2408a2cc6233fdfa307597commit | diff
Merge tag 'upstream/0.6.5.4'

Upstream version 0.6.5.4

Conflicts:
META
config/kernel-mk-request-fn.m4
configure
include/sys/zfs_ctldir.h
lib/libzfs/libzfs.pc
lib/libzfs/libzfs_core.pc
module/zfs/arc.c
module/zfs/zfs_ctldir.c
module/zfs/zpl_inode.c
module/zfs/zvol.c
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