Merge remote-tracking branch 'origin/master' into xc7mux

author Eddie Hung <eddie@fpgeh.com>

Tue, 28 May 2019 16:30:53 +0000 (09:30 -0700)

committer Eddie Hung <eddie@fpgeh.com>

Tue, 28 May 2019 16:30:53 +0000 (09:30 -0700)
author Eddie Hung <eddie@fpgeh.com>
Tue, 28 May 2019 16:30:53 +0000 (09:30 -0700)
committer Eddie Hung <eddie@fpgeh.com>
Tue, 28 May 2019 16:30:53 +0000 (09:30 -0700)
diff --cc README.md
Simple merge
diff --cc kernel/rtlil.h
Simple merge
author	Eddie Hung <eddie@fpgeh.com>
	Tue, 28 May 2019 16:30:53 +0000 (09:30 -0700)
committer	Eddie Hung <eddie@fpgeh.com>
	Tue, 28 May 2019 16:30:53 +0000 (09:30 -0700)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/rtlil.h	patch \|	diff1 \|	diff2 \|	blob \| history