Merge remote-tracking branch 'origin/master' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 30 Mar 2018 08:26:01 +0000 (10:26 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 30 Mar 2018 08:26:01 +0000 (10:26 +0200)
1  2 
config/qos/makeqosscripts.pl
make.sh

Simple merge
diff --cc make.sh
+++ b/make.sh
@@@ -1428,7 -1435,7 +1429,8 @@@ buildipfire() 
    lfsmake2 powertop
    lfsmake2 parted
    lfsmake2 swig
 +  lfsmake2 u-boot
+   lfsmake2 python-typing
    lfsmake2 python-m2crypto
    lfsmake2 wireless-regdb
    lfsmake2 crda