[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.6-2-7-g2d1f32d

[Aron Xu]

The following commit has been merged in the master branch:
commit fec6b0975dadccd102efbb43fe4cdf0a9456ba48
Merge: 7b211777933d1d7793bab0328f02e09f0bd82819 5eacc075a6d5f568b95682994ca4ea7120a0fef9
Author: Aron Xu <aron at debian.org>
Date:   Tue May 31 14:09:55 2016 +0800

    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


-- 
OpenZFS on Linux