Merge remote-tracking branch 'origin/master' into kernel-4.9
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 2 Nov 2017 22:40:49 +0000 (23:40 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 2 Nov 2017 22:40:49 +0000 (23:40 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge