Public Git Hosting - unleashed.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2e05132 a239e97)

commit	138bcd67433a37cc97c7254a04bb014f76bb9522
author	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Fri, 11 Jan 2019 16:04:09 +0000 (11 11:04 -0500)
committer	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Fri, 11 Jan 2019 16:04:09 +0000 (11 11:04 -0500)
tree	e2c8ab848818351820e68c6667b05a01175c463a	tree \| snapshot (tar.gz zip)
parent	2e0513218a4e656291dd9df53139ed3e0b6d4941	commit \| diff
parent	a239e970c64e3cf36327bef7b63193d0e6a25544	commit \| diff

Merge illumos-gate

12 files changed:

kernel/fs/zfs/zio.c	diff1 \|	\|	blob \| history
usr/src/boot/sys/boot/efi/libefi/Makefile.com	diff1 \|	diff2 \|	blob \| history
usr/src/boot/sys/boot/efi/loader/Makefile.com	diff1 \|	diff2 \|	blob \| history
usr/src/boot/sys/boot/i386/libi386/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/boot/sys/boot/i386/loader/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/boot/sys/boot/i386/pxeldr/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/boot/sys/boot/libficl/Makefile.com	diff1 \|	diff2 \|	blob \| history
usr/src/boot/sys/boot/libstand/Makefile.com	diff1 \|	diff2 \|	blob \| history
usr/src/boot/sys/boot/zfs/Makefile.com	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/init/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/init/init.c	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/io/cxgbe/t4nex/t4_sge.c	diff1 \|	diff2 \|	blob \| history

Unleashed OS