Andriy Gapon b985dac5ff fix a mismerge in r286539 (MFV 286538: 5562 ZFS sa_handle's violate...) ... PR: 202358 X-MFC with: r286539 X-MFC attn: mav		2015-08-21 08:04:56 +00:00
..
boot/zfs	MFV r274273:	2014-11-10 08:20:21 +00:00
compat/opensolaris	Add support for the arrays in nvlist library.	2015-08-15 06:34:49 +00:00
contrib/opensolaris	fix a mismerge in r286539 (MFV 286538: 5562 ZFS sa_handle's violate...)	2015-08-21 08:04:56 +00:00
dev	Remove a couple of unused fields from the FBT probe struct.	2015-08-03 17:39:36 +00:00