From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 2 Jun 2014 16:04:50 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-core79~40^2~1
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e0080803742226fed532dfead30c6f7d0d27e968;hp=8bab8832b7b7e4d4367961bc30f89b3a7ff301c9

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

diff --git a/lfs/linux b/lfs/linux
index 9146ad935f..a86dab692e 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -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 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 45
+PAK_VER    = 46
 DEPS	   = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -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)