Merge remote-tracking branch 'origin/next' into kernel-4.14

author Arne Fitzenreiter <arne_f@ipfire.org>

Wed, 29 Nov 2017 16:37:51 +0000 (17:37 +0100)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Wed, 29 Nov 2017 16:37:51 +0000 (17:37 +0100)
author Arne Fitzenreiter <arne_f@ipfire.org>
Wed, 29 Nov 2017 16:37:51 +0000 (17:37 +0100)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Wed, 29 Nov 2017 16:37:51 +0000 (17:37 +0100)
diff --cc lfs/linux
Simple merge
diff --cc make.sh
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 29 Nov 2017 16:37:51 +0000 (17:37 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 29 Nov 2017 16:37:51 +0000 (17:37 +0100)
		1	2
lfs/linux	patch \|	diff1 \|	diff2 \|	blob \| history
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history