aboutsummaryrefslogtreecommitdiffstats
path: root/target
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
commitc04ed164b05e5f461135bafeb35a014937283c80 (patch)
treeb4bb1c1cbd118e663044911471ab7ab12a38addd /target
parent508f1c2dbc7d1204dcdc9a4628c3687eea9ff542 (diff)
downloadupstream-c04ed164b05e5f461135bafeb35a014937283c80.tar.gz
upstream-c04ed164b05e5f461135bafeb35a014937283c80.tar.bz2
upstream-c04ed164b05e5f461135bafeb35a014937283c80.zip
kernel: update 3.14 to 3.14.12
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41582 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-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