summaryrefslogtreecommitdiffstats
path: root/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2014-05-06 05:26:24 +0200
committerGeorge Nita <george.nita@enea.com>2014-05-06 05:26:24 +0200
commit5d98064044ef8588ad7c884c8f0feb34e8bdbb9d (patch)
treeee5a6d18181e192b9089f189561ccd134410897e /meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
parent5d093e6f841cc82f072fd1b19573628392ca640a (diff)
parentd8e9e84375949ea82dadf214a04e94a2f871f5ce (diff)
downloadmeta-intel-5d98064044ef8588ad7c884c8f0feb34e8bdbb9d.tar.gz
Merge remote-tracking branch 'origin/daisy' into daisy-eneaenea-linux-4.0-rt-test1enea-linux-4.0-rc3enea-linux-4.0daisy-enea-mandaisy-enea
Diffstat (limited to 'meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend')
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 15d8b899..f5479c07 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -11,13 +11,13 @@ KMACHINE_crownbay-noemgd = "crownbay"
11KBRANCH_crownbay-noemgd = "standard/crownbay" 11KBRANCH_crownbay-noemgd = "standard/crownbay"
12KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" 12KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
13 13
14LINUX_VERSION_crownbay = "3.10.35" 14LINUX_VERSION_crownbay = "3.10.38"
15SRCREV_meta_crownbay = "b6e58b33dd427fe471f8827c83e311acdf4558a4" 15SRCREV_meta_crownbay = "1eb79862c2959cfa305773e7f785d6d1810bf190"
16SRCREV_machine_crownbay = "cee957655fe67826b2e827e2db41f156fa8f0cc4" 16SRCREV_machine_crownbay = "02f7e63e56c061617957388c23bd5cf9b05c5388"
17SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" 17SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
18 18
19LINUX_VERSION_crownbay-noemgd = "3.10.35" 19LINUX_VERSION_crownbay-noemgd = "3.10.38"
20SRCREV_meta_crownbay-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4" 20SRCREV_meta_crownbay-noemgd = "1eb79862c2959cfa305773e7f785d6d1810bf190"
21SRCREV_machine_crownbay-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4" 21SRCREV_machine_crownbay-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
22 22
23SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" 23SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"