Alexander Motin 32d8034f77 Fix minor mismerges. ... No functional change. MFC after: 1 week		2019-04-26 18:25:59 +00:00
..
boot/zfs	zfsboot: support newer ZFS versions	2019-01-03 22:49:11 +00:00
compat/opensolaris	Introduce funlinkat syscall that always us to check if we are removing	2019-04-06 09:34:26 +00:00
contrib/opensolaris	Fix minor mismerges.	2019-04-26 18:25:59 +00:00
dev	powerpc/dtrace: Fix dtrace powerpc asm, and simplify stack walking	2019-04-13 03:32:21 +00:00