Merge remote-tracking branch 'origin/next' into kernel-update

diff --combined make.sh
index b1b8514daca8b1cc0d4a2ffb90c23eee77d9817c,9b27f059bdb393266d4205e1b9dad4c640cdb0c1..9e34c03cca677414452c344a2206165b6a7a2109
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"                                                 # Software nam
  SNAME="ipfire"                                                        # Short name
  VERSION="2.11"                                                        # Version number
  CORE="59"                                                     # Core Level (Filename)
- PAKFIRE_CORE="58"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="59"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -436,9 -436,6 +436,9 @@@ buildipfire() 
      ipfiremake e1000e                 KCFG=""
      ipfiremake igb                    KCFG=""
    else
 +    # arm-omap kernel build
 +    ipfiremake linux3                 KCFG="-omap"
 +
      # arm-versatile kernel build
      ipfiremake linux                  KCFG="-versatile"
      ipfiremake v4l-dvb                        KCFG="-versatile"