Merge branch 'master' into core-updates

author Mark H Weaver <mhw@netris.org>

Wed, 30 May 2018 06:21:29 +0000 (02:21 -0400)

committer Mark H Weaver <mhw@netris.org>

Wed, 30 May 2018 06:21:29 +0000 (02:21 -0400)
author Mark H Weaver <mhw@netris.org>
Wed, 30 May 2018 06:21:29 +0000 (02:21 -0400)
committer Mark H Weaver <mhw@netris.org>
Wed, 30 May 2018 06:21:29 +0000 (02:21 -0400)
diff --cc gnu/local.mk
Simple merge
diff --cc gnu/packages/linux.scm
Simple merge
diff --cc gnu/packages/xorg.scm
Simple merge
author	Mark H Weaver <mhw@netris.org>
	Wed, 30 May 2018 06:21:29 +0000 (02:21 -0400)
committer	Mark H Weaver <mhw@netris.org>
	Wed, 30 May 2018 06:21:29 +0000 (02:21 -0400)
		1	2
gnu/local.mk	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/xorg.scm	patch \|	diff1 \|	diff2 \|	blob \| history