]> git.proxmox.com Git - mirror_spl-debian.git/commitdiff
Merge tag 'upstream/0.6.5.3'
authorAron Xu <aron@debian.org>
Thu, 5 Nov 2015 13:06:43 +0000 (21:06 +0800)
committerAron Xu <aron@debian.org>
Thu, 5 Nov 2015 13:06:43 +0000 (21:06 +0800)
Upstream version 0.6.5.3

Conflicts:
META
configure
module/spl/spl-taskq.c
rpm/generic/spl-kmod.spec.in
rpm/generic/spl.spec.in
rpm/redhat/spl.spec.in


Trivial merge