summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-12-10 04:22:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-21 12:37:54 +0000
commitfc152d9fe7aedc65dc20d8ba4dfa5d02f12a0beb (patch)
treea59547120ba74d85f963c95a322226db777368bf /meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
parent88fb7391496312aff9332e8370c91a52ce160517 (diff)
downloadpoky-fc152d9fe7aedc65dc20d8ba4dfa5d02f12a0beb.tar.gz
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
Updating the 3.14 tree to the latest korg 3.14.26, as well as integrating 3.14 LTSI content, and refreshing preempt-rt. Minor conflict resolutions were performed between ltsi, stable and -rt (From OE-Core rev: 8c30cec8233605cbec334fcc5c2b9ef5cf8f6482) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index d168a2acbb..67bf4624f8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.14.24"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "c100e8665052051487a17169748c457829d3f88c" 11SRCREV_machine ?= "02120556b0ebc20c30374ccf211e8e4ceac2bb1c"
12SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" 12SRCREV_meta ?= "a227f20eff056e511d504b2e490f3774ab260d6f"
13 13
14PV = "${LINUX_VERSION}+git${SRCPV}" 14PV = "${LINUX_VERSION}+git${SRCPV}"
15 15