Revert "zfs: Use my fork"

This reverts commit 9ec23d4e6e49fcf6427970f26a987d69633411d6.
Merge branch 'funtoo.org' into armv7a_hardfp