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

3915 Add adjuncts support to the build
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@nexenta.com>

6425511 metassist keywords check should not check SCCS files
6425491 mkhdr.sh generates SCCS keywords
6425482 .ed files try to match on inappropriate terms (SCCS keywords)
Contributed by Richard Lowe

6425511 metassist keywords check should not check SCCS files
6425491 mkhdr.sh generates SCCS keywords
6425482 .ed files try to match on inappropriate terms (SCCS keywords)
Contributed by Richard Lowe <richlowe@richlowe.net>

show more ...

OpenSolaris Launch