Merge branch 'next' into kernel-update

diff --combined make.sh
index da98e2883fb221360680b06fa9a0a79fcc28ddca,4e797937e87a7e92c7474605de1d97332567d906..b1b8514daca8b1cc0d4a2ffb90c23eee77d9817c
--- 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.11"                                                        # Version number
- CORE="58"                                                     # Core Level (Filename)
- PAKFIRE_CORE="57"                                             # Core Level (PAKFIRE)
+ CORE="59"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="58"                                             # 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"