Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --combined lfs/linux
index 1891442ee3d79d203a75b528dc073ebbd8d9c492,9146ad935f2ab2c79cde397a17fa523b0d13d612..a86dab692eba3dd078a846b7dd2609e68f2159d1
--- 1/lfs/linux
--- 2/lfs/linux
+++ b/lfs/linux
@@@ -24,10 -24,10 +24,10 @@@
  
  include Config
  
 -VER        = 3.10.40
 +VER        = 3.10.41
  
  RPI_PATCHES = linux-3.10.38-grsec-1b49b45
 -GRS_PATCHES = grsecurity-2.9.1-3.10.40-ipfire1.patch.xz
 +GRS_PATCHES = grsecurity-2.9.1-3.10.41-ipfire1.patch.xz
  
  THISAPP    = linux-$(VER)
  DL_FILE    = linux-$(VER).tar.xz
@@@ -36,7 -36,7 +36,7 @@@ DIR_APP    = $(DIR_SRC)/$(THISAPP
  CFLAGS     =
  CXXFLAGS   =
  
 -PAK_VER    = 45
 +PAK_VER    = 46
  DEPS     = ""
  
  VERSUFIX=ipfire$(KCFG)
@@@ -74,9 -74,9 +74,9 @@@ $(DL_FILE)                            = $(URL_IPFIRE)/$(DL_FILE
  rpi-patches-$(RPI_PATCHES).patch.xz   = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
  $(GRS_PATCHES)                                = $(URL_IPFIRE)/$(GRS_PATCHES)
  
 -$(DL_FILE)_MD5                                = c1dca08f0f1a60f29b7caa9ff45582a8
 +$(DL_FILE)_MD5                                = 08631db3e6b4328b0315f59ef3fa7b0a
  rpi-patches-$(RPI_PATCHES).patch.xz_MD5       = a7408e8bad57b4b2cb677dd5a0bfb7ff
 -$(GRS_PATCHES)_MD5                    = f46506dd67e459fc41d60d0641323668
 +$(GRS_PATCHES)_MD5                    = de48891a35952a3c6de5beea694f7557
  
  install : $(TARGET)
  
@@@ -253,26 -253,26 +253,26 @@@ els
  
        # Cleanup kernel source
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
-       cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
-       cd $(DIR_APP) && make CC="$(KGCC)" clean
+       cd $(DIR_APP) && make oldconfig
+       cd $(DIR_APP) && make clean
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
  
  ifeq "$(KCFG)" "-kirkwood"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage modules
+       cd $(DIR_APP) && make $(MAKETUNING) uImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
  else
  ifeq "$(KCFG)" "-multi"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage modules
+       cd $(DIR_APP) && make $(MAKETUNING) zImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/zImage-$(VERSUFIX)
  else
  ifeq "$(KCFG)" "-rpi"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage modules
+       cd $(DIR_APP) && make $(MAKETUNING) zImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/kernel.img
  else
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage modules
+       cd $(DIR_APP) && make $(MAKETUNING) bzImage modules
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
  endif
@@@ -281,11 -281,11 +281,11 @@@ endi
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
        ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX)
-       cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
-       cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
+       cd $(DIR_APP) && make $(MAKETUNING) modules_install
+       cd $(DIR_APP) && make $(MAKETUNING) firmware_install
  
  ifeq "$(MACHINE_TYPE)" "arm"
-       cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) dtbs
+       cd $(DIR_APP) && make $(MAKETUNING) dtbs
        cd $(DIR_APP) && for f in $$(find arch/arm/boot/dts/ -name *.dtb); do \
                                mkdir -p /boot/dtb-$(VER)-$(VERSUFIX) ; \
                                install -m 644 $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \