aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-05-14 21:49:27 +0000
committerLuka Perkov <luka@openwrt.org>2014-05-14 21:49:27 +0000
commit164fe72921e83732292296b480e8fcc5bba9d95a (patch)
tree9ea6cfccfa50ed701f2d4806ee688d3aad94ecad /target
parent574dc9ecf4c65ab55b8bc079d480a0c1259d838b (diff)
downloadmaster-187ad058-164fe72921e83732292296b480e8fcc5bba9d95a.tar.gz
master-187ad058-164fe72921e83732292296b480e8fcc5bba9d95a.tar.bz2
master-187ad058-164fe72921e83732292296b480e8fcc5bba9d95a.zip
kernel: update 3.14 to 3.14.4
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40769 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-3.14/902-debloat_proc.patch2
-rw-r--r--target/linux/x86_64/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.14/902-debloat_proc.patch b/target/linux/generic/patches-3.14/902-debloat_proc.patch
index 8306a0b0d1..87909fd8cf 100644
--- a/target/linux/generic/patches-3.14/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.14/902-debloat_proc.patch
@@ -1,6 +1,6 @@
--- a/fs/locks.c
+++ b/fs/locks.c
-@@ -2430,6 +2430,8 @@ static const struct file_operations proc
+@@ -2429,6 +2429,8 @@ static const struct file_operations proc
static int __init proc_locks_init(void)
{
diff --git a/target/linux/x86_64/Makefile b/target/linux/x86_64/Makefile
index 43326b2185..e995dae4dc 100644
--- a/target/linux/x86_64/Makefile
+++ b/target/linux/x86_64/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=x86_64
FEATURES:=ext4 vdi vmdk targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.14.3
+LINUX_VERSION:=3.14.4
KERNELNAME:=bzImage