Brian Behlendorf 1272941f49 Merge branch 'zfsonlinux/merge-spl' ... Merge a minimal version of the zfsonlinux/spl repository in to the zfsonlinux/zfs repository. Care was taken to prevent file conflicts when merging and to preserve the spl repository history. The spl kernel module remains under the GPLv2 license as documented by the additional THIRDPARTYLICENSE.gplv2 file. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>		2018-05-29 14:57:55 -07:00
..
Makefile.am	Prepare SPL repo to merge with ZFS repo	2018-05-29 14:51:39 -07:00
spl-module-parameters.5	Update spl module parameters man5 with missing parameter details	2017-10-27 15:46:34 -07:00
vdev_id.conf.5	vdev_id: new slot type ses	2017-12-20 09:42:07 -08:00
zfs-events.5	Extend deadman logic	2018-01-25 13:40:38 -08:00
zfs-module-parameters.5	OpenZFS 9486 - reduce memory used by device removal on fragmented pools	2018-05-24 10:18:07 -07:00
zpool-features.5	OpenZFS 7614, 9064 - zfs device evacuation/removal	2018-04-14 12:16:17 -07:00