Merge pull request #749 from lotheac/illumos_fixes

author Zhang Xianyi <traits.zhang@gmail.com>

Tue, 26 Jan 2016 14:42:20 +0000 (08:42 -0600)

committer Zhang Xianyi <traits.zhang@gmail.com>

Tue, 26 Jan 2016 14:42:20 +0000 (08:42 -0600)
author Zhang Xianyi <traits.zhang@gmail.com>
Tue, 26 Jan 2016 14:42:20 +0000 (08:42 -0600)
committer Zhang Xianyi <traits.zhang@gmail.com>
Tue, 26 Jan 2016 14:42:20 +0000 (08:42 -0600)
diff --cc Makefile
Simple merge
diff --cc Makefile.install
Simple merge
diff --cc Makefile.system
Simple merge
diff --cc driver/others/memory.c
Simple merge
diff --cc exports/Makefile
Simple merge
diff --cc getarch.c
Simple merge
author	Zhang Xianyi <traits.zhang@gmail.com>
	Tue, 26 Jan 2016 14:42:20 +0000 (08:42 -0600)
committer	Zhang Xianyi <traits.zhang@gmail.com>
	Tue, 26 Jan 2016 14:42:20 +0000 (08:42 -0600)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.install	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.system	patch \|	diff1 \|	diff2 \|	blob \| history
driver/others/memory.c	patch \|	diff1 \|	diff2 \|	blob \| history
exports/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
getarch.c	patch \|	diff1 \|	diff2 \|	blob \| history