Xin LI 0b66c7c514 Fix a mismerge in r260183 which prevents snapshot zvol devices being ... removed and re-instate the fix in r242862. Reported by: Leon Dang <ldang nahannisys com>, smh MFC after: 3 days		2014-09-30 18:50:45 +00:00
..
boot/zfs	MFV r271510:	2014-09-13 16:26:14 +00:00
compat/opensolaris	Remove sys/types.h include as per style (9)	2014-09-18 20:38:18 +00:00
contrib/opensolaris	Fix a mismerge in r260183 which prevents snapshot zvol devices being	2014-09-30 18:50:45 +00:00
dev	Fix the stack tracing for dtrace/powerpc.	2014-09-17 02:43:47 +00:00