4178 lofiadm usage message for the -a option is bogus
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Robert Mustacchi <rm@joyent.com>
4458 iscsit discovery reply should be more strict WRT TPGs
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Saso Kiselkov <skiselkov.ml@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
4297 ::help tab completion
4298 ::printf tab completion
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
3995 Memory leak of compressed buffers in l2arc_write_done
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Garrett D'Amore <garrett@damore.org>
3105 Kernel inet_pton() implementation returns result in host byte order
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Robert Mustacchi <rm@joyent.com>
	[illumos-gate merge]

commit 59927d313a821b7f3822314ed16fc0a44c128431
    3105 Kernel inet_pton() implementation returns result in host byte order
commit 71cb1b742ca23532b844b6538d8f0997a900c62e
    3995 Memory leak of compressed buffers in l2arc_write_done
commit 2f045fd6af922f819146b314d143b660b58b20b7
    4297 ::help tab completion
    4298 ::printf tab completion
commit 483b029ba8436049005eb485fcc9b26f2484f7ea
    4458 iscsit discovery reply should be more strict WRT TPGs
commit 795f5a90106de513be157280283fe8dd0c976787
    4178 lofiadm usage message for the -a option is bogus

Conflicts:
	usr/src/cmd/mdb/common/mdb/mdb_print.c
	usr/src/cmd/mdb/common/mdb/mdb_cmds.c