Public Git Hosting - unleashed.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 849336a 0e8ce6e)

commit	065ee4397b3b21c75280508a6ab5756652b8f9e5
author	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Mon, 1 Oct 2018 12:56:13 +0000 (1 08:56 -0400)
committer	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Mon, 1 Oct 2018 12:56:13 +0000 (1 08:56 -0400)
tree	239c51229074ba1ed0ae8890fd267d23f1749632	tree \| snapshot (tar.gz zip)
parent	849336a4144a296fadc116a27a1cfb559ae2031d	commit \| diff
parent	0e8ce6ee7524ee6c2c24a2d4ed28ea71a5dcd85e	commit \| diff

Merge commit '0e8ce6ee7524ee6c2c24a2d4ed28ea71a5dcd85e'

12 files changed:

include/sys/queue.h	diff1 \|	diff2 \|	blob \| history
kernel/fs/zfs/spa.c	diff1 \|	diff2 \|	blob \| history
share/man/man3head/Makefile	diff1 \|	\|	blob \| history
share/man/man3head/queue.h.3head	\|	diff2 \|	blob \| history
usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/ipqosconf.c	diff1 \|	diff2 \|	blob \| history
usr/src/lib/brand/ipkg/zone/platform.xml	diff1 \|	diff2 \|	blob \| history
usr/src/lib/brand/sn1/zone/platform.xml	diff1 \|	diff2 \|	blob \| history
usr/src/lib/fm/topo/modules/common/smbios/smbios_enum.c	\|	diff2 \|	blob \| history
usr/src/pkg/manifests/service-fault-management.mf	diff1 \|	diff2 \|	blob \| history
usr/src/pkg/manifests/system-header.mf	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/io/sata/adapters/ahci/ahci.c	diff1 \|	diff2 \|	blob \| history
usr/src/uts/intel/Makefile.files	diff1 \|	diff2 \|	blob \| history

Unleashed OS