Xin LI c92bc5e996 Manually merge part of vendor import r238583 from Illumos. ... Illumos changeset: 13680:2bd022a765e2 Illumos ZFS issue: 2671 zpool import should not fail if vdev ashift has increased MFC after: 3 days		2013-07-18 00:22:42 +00:00
..
compat/opensolaris
contrib	Manually merge part of vendor import r238583 from Illumos.	2013-07-18 00:22:42 +00:00
lib	Bring back part of r249367 by adding DTrace's temporal option, which allows	2013-05-12 16:26:33 +00:00
sbin	WiP merge of libzfs_core (MFV r238590, r238592)	2013-03-05 08:09:53 +00:00
usr.bin	WiP merge of libzfs_core (MFV r238590, r238592)	2013-03-05 08:09:53 +00:00
usr.sbin	WiP merge of libzfs_core (MFV r238590, r238592)	2013-03-05 08:09:53 +00:00
Makefile
Makefile.inc