aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-07-11 13:28:44 +0000
committerLuka Perkov <luka@openwrt.org>2014-07-11 13:28:44 +0000
commita145a22f668771fc27515b3772ee757ab05f66e4 (patch)
tree948f53203b8c47ec20a6b89d2a7f4da5fd332123 /target/linux
parent2bc22025dd6579f00b470fef61a63d35f182792f (diff)
downloadupstream-a145a22f668771fc27515b3772ee757ab05f66e4.tar.gz
upstream-a145a22f668771fc27515b3772ee757ab05f66e4.tar.bz2
upstream-a145a22f668771fc27515b3772ee757ab05f66e4.zip
kernel: update 3.14 to 3.14.12
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 41582
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mvebu/Makefile2
-rw-r--r--target/linux/x86_64/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index a2d78df586..6b602315d7 100644
--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
CPU_SUBTYPE:=vfpv3
MAINTAINER:=Luka Perkov <luka@openwrt.org>
-LINUX_VERSION:=3.14.11
+LINUX_VERSION:=3.14.12
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/x86_64/Makefile b/target/linux/x86_64/Makefile
index a029719de1..93097e63bf 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.11
+LINUX_VERSION:=3.14.12
KERNELNAME:=bzImage