diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-05-14 21:49:27 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-05-14 21:49:27 +0000 |
| commit | 645596489ff4759a4767f6e4e6901f21709774a5 (patch) | |
| tree | 023ea649cff9aa1f08d274cc760f94cbe5f6a298 /target/linux | |
| parent | 74906592549c6ca238562e740f1e61ed5fc6371f (diff) | |
| download | upstream-645596489ff4759a4767f6e4e6901f21709774a5.tar.gz upstream-645596489ff4759a4767f6e4e6901f21709774a5.tar.bz2 upstream-645596489ff4759a4767f6e4e6901f21709774a5.zip | |
kernel: update 3.14 to 3.14.4
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 40769
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/patches-3.14/902-debloat_proc.patch | 2 | ||||
| -rw-r--r-- | target/linux/x86_64/Makefile | 2 |
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 8306a0b0d15..87909fd8cfe 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 43326b21857..e995dae4dc0 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 |