Xin LI faeec9b29a MFC r200727: ... Apply fix for Solaris bug 6764159: restore_object() makes a call that can block while having a tx open but not yet committed (onnv revision 7994) Submitted by: mm Approved by: pjd Obtained from: OpenSolaris		2010-01-03 03:10:28 +00:00
..
ctf	This commit was generated by cvs2svn to compensate for changes in r179193,	2008-05-22 07:04:10 +00:00
dtrace	Add the OpenSolaris dtrace lockstat provider. The lockstat provider	2009-05-26 20:28:22 +00:00
fs	MFC r200727:	2010-01-03 03:10:28 +00:00
os	MFC r196295:	2009-08-17 09:03:47 +00:00
sys	MFC r198703,r199156,r199157:	2009-11-14 11:59:59 +00:00
zmod	- rename atomic.S and crc32.c to avoid collisions when linking zfs in to the kernel	2009-05-09 01:45:55 +00:00
Makefile.files	Update ZFS from version 6 to 13 and bring some FreeBSD-specific changes.	2008-11-17 20:49:29 +00:00