Public Git Hosting - unleashed.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 18a3cbb 856f620)

commit	0e4e5833cbdccda8225e2652998b275c9d65e362
author	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Mon, 1 Oct 2018 21:29:45 +0000 (1 17:29 -0400)
committer	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Mon, 1 Oct 2018 21:29:45 +0000 (1 17:29 -0400)
tree	e49818c52a5cc58e2e5dc6f4f5a3ef081b653100	tree \| snapshot (tar.gz zip)
parent	18a3cbb20f2c0825d293276f3c227c5fc2df0b8d	commit \| diff
parent	856f620e96e5413932a6607aea5094db2ece172f	commit \| diff

Merge commit '856f620e96e5413932a6607aea5094db2ece172f'

19 files changed:

include/sys/elf.h	diff1 \|	diff2 \|	blob \| history
include/sys/nvme.h	diff1 \|	\|	blob \| history
include/sys/queue.h	diff1 \|	diff2 \|	blob \| history
include/sys/sata/adapters/ahci/ahciem.h	\|	diff2 \|	blob \| history
include/sys/sata/adapters/ahci/ahcivar.h	diff1 \|	\|	blob \| history
include/sys/usb/hcd/ehci/ehci.h	diff1 \|	diff2 \|	blob \| history
share/man/man3head/Makefile	diff1 \|	\|	blob \| history
share/man/man7d/nvme.7d	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/ahciem/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/ipqosconf.c	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/nvmeadm/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/lib/libsldap/common/ns_writes.c	diff1 \|	diff2 \|	blob \| history
usr/src/pkg/manifests/driver-storage-ahci.inc	diff1 \|	\|	blob \| history
usr/src/pkg/manifests/system-header.mf	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/io/nvme/nvme.c	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/io/sata/adapters/ahci/ahci.c	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/io/sata/impl/sata.c	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c	diff1 \|	diff2 \|	blob \| history

Unleashed OS