Merge branch 'kernel-4.14' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 May 2018 07:14:42 +0000 (09:14 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 May 2018 07:14:42 +0000 (09:14 +0200)
1  2 
config/rootfiles/oldcore/120/update.sh
make.sh

diff --cc make.sh
Simple merge