Merge remote-tracking branch 'origin/next' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 15 Jan 2018 18:08:23 +0000 (19:08 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 15 Jan 2018 18:08:23 +0000 (19:08 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge