Merge remote-tracking branch 'upstream/master'

author Jason Lowdermilk <jlowder@chipscan.us>

Wed, 30 Aug 2017 17:47:06 +0000 (11:47 -0600)

committer Jason Lowdermilk <jlowder@chipscan.us>

Wed, 30 Aug 2017 17:47:06 +0000 (11:47 -0600)
author Jason Lowdermilk <jlowder@chipscan.us>
Wed, 30 Aug 2017 17:47:06 +0000 (11:47 -0600)
committer Jason Lowdermilk <jlowder@chipscan.us>
Wed, 30 Aug 2017 17:47:06 +0000 (11:47 -0600)
diff --cc kernel/rtlil.cc
Simple merge
diff --cc kernel/rtlil.h
Simple merge
author	Jason Lowdermilk <jlowder@chipscan.us>
	Wed, 30 Aug 2017 17:47:06 +0000 (11:47 -0600)
committer	Jason Lowdermilk <jlowder@chipscan.us>
	Wed, 30 Aug 2017 17:47:06 +0000 (11:47 -0600)
		1	2
kernel/rtlil.cc	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/rtlil.h	patch \|	diff1 \|	diff2 \|	blob \| history