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

author Eddie Hung <eddie@fpgeh.com>

Wed, 7 Aug 2019 20:44:08 +0000 (13:44 -0700)

committer Eddie Hung <eddie@fpgeh.com>

Wed, 7 Aug 2019 20:44:08 +0000 (13:44 -0700)
author Eddie Hung <eddie@fpgeh.com>
Wed, 7 Aug 2019 20:44:08 +0000 (13:44 -0700)
committer Eddie Hung <eddie@fpgeh.com>
Wed, 7 Aug 2019 20:44:08 +0000 (13:44 -0700)
diff --cc kernel/rtlil.cc
Simple merge
diff --cc kernel/rtlil.h
Simple merge
author	Eddie Hung <eddie@fpgeh.com>
	Wed, 7 Aug 2019 20:44:08 +0000 (13:44 -0700)
committer	Eddie Hung <eddie@fpgeh.com>
	Wed, 7 Aug 2019 20:44:08 +0000 (13:44 -0700)
		1	2
kernel/rtlil.cc	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/rtlil.h	patch \|	diff1 \|	diff2 \|	blob \| history