Merge remote-tracking branch 'origin/next' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 29 Nov 2017 16:37:51 +0000 (17:37 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 29 Nov 2017 16:37:51 +0000 (17:37 +0100)
1  2 
lfs/linux
make.sh

diff --cc lfs/linux
Simple merge
diff --cc make.sh
Simple merge