Merge branch 'master' into kernel-test

diff --combined make.sh
index f1c39dbece6883aa99afb6532a27bd6772073114,9084df249be404d0aeb77d090bcfd8bfe1bbcb57..536ed6fcd9bb3817879e7acf7cf702d1079d4847
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.15"                                                        # Version number
- CORE="82"                                                     # Core Level (Filename)
- PAKFIRE_CORE="82"                                             # Core Level (PAKFIRE)
+ CORE="83"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="83"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -413,8 -413,6 +413,8 @@@ buildipfire() 
  #             ipfiremake r8101                        KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
                ipfiremake igb                          KCFG="-pae"
 +              ipfiremake ixgbe                        KCFG="-pae"
 +
  
                # x86 kernel build
                ipfiremake linux                        KCFG=""
@@@ -428,7 -426,6 +428,7 @@@
  #             ipfiremake r8101                        KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
 +              ipfiremake ixgbe                        KCFG=""
                ;;
  
        armv5tel)
@@@ -444,7 -441,6 +444,7 @@@
                ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
                ipfiremake igb                          KCFG="-multi"
 +              ipfiremake ixgbe                        KCFG="-multi"
  
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
@@@ -455,9 -451,8 +455,9 @@@
  #             ipfiremake r8169                        KCFG="-kirkwood"
  #             ipfiremake r8168                        KCFG="-kirkwood"
  #             ipfiremake r8101                        KCFG="-kirkwood"
 -#             ipfiremake e1000e                       KCFG="-kirkwood"
 +              ipfiremake e1000e                       KCFG="-kirkwood"
                ipfiremake igb                          KCFG="-kirkwood"
 +              ipfiremake ixgbe                        KCFG="-kirkwood"
                ;;
    esac
    ipfiremake pkg-config