Merge remote-tracking branch 'origin/master' into kernel-4.9
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 22 Oct 2017 19:57:17 +0000 (21:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 22 Oct 2017 19:57:30 +0000 (21:57 +0200)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
1  2 
make.sh

diff --cc make.sh
Simple merge