Merge tag 'upstream/0.6.5.4'

Upstream version 0.6.5.4

Conflicts:
	META
	config/kernel-mk-request-fn.m4
	configure
	include/sys/zfs_ctldir.h
	lib/libzfs/libzfs.pc
	lib/libzfs/libzfs_core.pc
	module/zfs/arc.c
	module/zfs/zfs_ctldir.c
	module/zfs/zpl_inode.c
	module/zfs/zvol.c
	rpm/generic/zfs-kmod.spec.in
	rpm/generic/zfs.spec.in
	rpm/redhat/zfs.spec.in
	zfs_config.h.in