Author: Sebastien Roy <Sebastien.Roy at Sun.COM> Changeset: 7502:32c4423f2817 Comments: hg merge has butchered the clearview gate
Files: usr/src/cmd/dlmgmtd/dlmgmt_main.c usr/src/lib/libdladm/common/libdlaggr.c usr/src/uts/common/inet/iptun/iptun_ctl.c usr/src/uts/common/io/aggr/aggr_dev.c usr/src/uts/common/io/dld/dld_drv.c usr/src/uts/common/io/vnic/vnic_ctl.c usr/src/uts/common/sys/dld_ioc.h usr/src/uts/common/sys/vnic.h
