Author: Anthony Scarpino <Anthony.Scarpino at Sun.COM> Repository: /hg/zfs-crypto/gate Latest revision: a5541677420888a71a5152c49ebc886381db99ae Total changesets: 1 Log message: merge and cry == null change Files: delete: usr/src/cmd/dtrace/test/cmd/chkargs/32/Makefile delete: usr/src/cmd/dtrace/test/cmd/chkargs/64/Makefile delete: usr/src/lib/smbsrv/libsmbns/common/smbns_nicconfig.c update: usr/src/cmd/zfs/zfs_main.c update: usr/src/cmd/zpool/zpool_main.c update: usr/src/lib/libzfs/common/libzfs.h update: usr/src/lib/libzfs/common/libzfs_crypto.c update: usr/src/lib/libzfs/common/libzfs_dataset.c