Merge remote-tracking branch 'illumos-ml/master' into titanic

Some zev merge conflicts fixed.

Conflicts:
usr/src/uts/common/fs/zfs/zfs_ioctl.c
usr/src/uts/common/fs/zfs/zvol.c

3881 want device driver for HP SmartArray RAID controllers
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Eric Sproul <esproul@omniti.com>
Reviewed by: ken mays <maybird1776@yahoo.com>

3881 want device driver for HP SmartArray RAID controllers
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Eric Sproul <esproul@omniti.com>
Reviewed by: ken mays <maybird1776@yahoo.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>

show more ...