Merge pull request #5708 from vcatechnology/arm-cross-compile

author Lennart Poettering <lennart@poettering.net>

Mon, 17 Apr 2017 13:49:06 +0000 (15:49 +0200)

committer GitHub <noreply@github.com>

Mon, 17 Apr 2017 13:49:06 +0000 (15:49 +0200)
author Lennart Poettering <lennart@poettering.net>
Mon, 17 Apr 2017 13:49:06 +0000 (15:49 +0200)
committer GitHub <noreply@github.com>
Mon, 17 Apr 2017 13:49:06 +0000 (15:49 +0200)
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 17 Apr 2017 13:49:06 +0000 (15:49 +0200)
committer	GitHub <noreply@github.com>
	Mon, 17 Apr 2017 13:49:06 +0000 (15:49 +0200)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history