Merge branch 'kernel-4.14' into next

author Arne Fitzenreiter <arne_f@ipfire.org>

Sat, 5 May 2018 07:14:42 +0000 (09:14 +0200)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Sat, 5 May 2018 07:14:42 +0000 (09:14 +0200)
author Arne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 May 2018 07:14:42 +0000 (09:14 +0200)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 May 2018 07:14:42 +0000 (09:14 +0200)
diff --cc config/rootfiles/oldcore/120/update.sh
Simple merge
diff --cc make.sh
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Sat, 5 May 2018 07:14:42 +0000 (09:14 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Sat, 5 May 2018 07:14:42 +0000 (09:14 +0200)
		1	2
config/rootfiles/oldcore/120/update.sh	patch \|	diff1 \|	diff2 \|	blob \| history
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history