Author: Anthony Scarpino <Anthony.Scarpino at Sun.COM> Repository: /hg/zfs-crypto/gate Latest revision: 01cc8da2cdc86c4bb6aa4677d469aaed57aa910b Total changesets: 1 Log message: merge with ''344 key load broken'' Files: update: usr/src/common/zfs/zfs_prop.c update: usr/src/lib/libzfs/common/libzfs_crypto.c update: usr/src/uts/common/fs/zfs/sys/zio_crypt.h update: usr/src/uts/common/fs/zfs/zfs_ioctl.c update: usr/src/uts/common/fs/zfs/zio_crypt.c