K 10
svn:author
V 7
asomers
K 8
svn:date
V 27
2016-04-22T15:08:50.745363Z
K 7
svn:log
V 391
IFC @298420

sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
	Throw away local changes.  They've all been made in head, some in
	different forms.

tests/sys/geom
	Delete the local files, accept head's, and readd geom_part_test.sh
	in tests/sys/geom/class/part.  I couldn't figure out how to resolve
	the directory conflict in a more elegant way.

Sponsored by:	Spectra Logic Corp

END