Add benchmark results.
Merge branch 'master' of git://github.com/zfsrogue/zfs-crypto into feature
pool upgrade needs to increment feature@encryption
Merge branch 'master' of git://github.com/zfsrogue/zfs-crypto into feature-import
Merge branch 'master' of git://github.com/zfsrogue/zfs-crypto
Merge branch 'master' of git://github.com/zfsrogue/zfs-crypto
"zfs key -c" re-keying would result in SPL kmem alloc warnings. Changed
alloc to KM_PUSHPAGE.
Merge branch 'master' of git://github.com/zfsrogue/zfs-crypto
Fix KEY generation to proper pkcs5 pbkdf2, using Solaris parameters. This
makes the keys compatible between the platforms.
Merge branch 'feature-import'

Now that we use pool features, we can leave the ability to handle
pool v30, since the default pool version is 5000. Thus we can
import Solaris pools directly, using encryption, into feature pools.

Conflicts:
	include/sys/fs/zfs.h
Merge pull request #11 from lundman/master

Correct KeyGen, importing pools sets feature flags