Merge remote-tracking branch 'ms/x86_64' into next

author Michael Tremer <michael.tremer@ipfire.org>

Fri, 11 Sep 2015 14:06:09 +0000 (15:06 +0100)

committer Michael Tremer <michael.tremer@ipfire.org>

Fri, 11 Sep 2015 14:06:09 +0000 (15:06 +0100)
author Michael Tremer <michael.tremer@ipfire.org>
Fri, 11 Sep 2015 14:06:09 +0000 (15:06 +0100)
committer Michael Tremer <michael.tremer@ipfire.org>
Fri, 11 Sep 2015 14:06:09 +0000 (15:06 +0100)
diff --cc lfs/glibc
Simple merge
diff --cc lfs/postfix
Simple merge
diff --cc make.sh
Simple merge
author	Michael Tremer <michael.tremer@ipfire.org>
	Fri, 11 Sep 2015 14:06:09 +0000 (15:06 +0100)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Fri, 11 Sep 2015 14:06:09 +0000 (15:06 +0100)
		1	2
lfs/glibc	patch \|	diff1 \|	diff2 \|	blob \| history
lfs/postfix	patch \|	diff1 \|	diff2 \|	blob \| history
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history