summaryrefslogtreecommitdiff
path: root/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-11-30 12:33:50 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:30:35 +0000
commit8ac0c82bb8fe4fe17b6a32b18e57546d21b4d5ef (patch)
tree8d88de7551b22b2e9722e07edce37e9faf19f004 /meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
parent699b3b4451a7fe88e0dab46c5a781998226e377e (diff)
downloadopenembedded-core-8ac0c82bb8fe4fe17b6a32b18e57546d21b4d5ef.tar.gz
openembedded-core-8ac0c82bb8fe4fe17b6a32b18e57546d21b4d5ef.tar.bz2
openembedded-core-8ac0c82bb8fe4fe17b6a32b18e57546d21b4d5ef.zip
linux-yocto/3.4: merge v3.4.19, v3.4.20
Updating the linux-yocto-3.4 trees to incorporate both 3.4.19 and 3.4.20 from the kernel.org -stable team. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index ab214c8665..d6fe8bbaf5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
LINUX_KERNEL_TYPE = "tiny"
KCONFIG_MODE = "--allnoconfig"
-LINUX_VERSION ?= "3.4.18"
+LINUX_VERSION ?= "3.4.20"
KMETA = "meta"
-SRCREV_machine ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14"
-SRCREV_meta ?= "4e5f2b43acfbdb924edbdf42a816e3e2b15203b3"
+SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
+SRCREV_meta ?= "8b0a93c0a224c9b91f90545b123b055b2e313bfc"
PR = "${INC_PR}.0"
PV = "${LINUX_VERSION}+git${SRCPV}"