summaryrefslogtreecommitdiffstats
path: root/meta-crownbay
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2014-05-01 03:26:20 (GMT)
committerGeorge Nita <george.nita@enea.com>2014-05-01 03:26:20 (GMT)
commit5d093e6f841cc82f072fd1b19573628392ca640a (patch)
tree8ff0499e7acbd5f3ad70d5db8010e5fc34fdfa0a /meta-crownbay
parentdf9561721a075c978eebf73a8ee5acd02e95fc73 (diff)
parent6ae8765812590327df5f2843b5542750a851d1bd (diff)
downloadmeta-intel-5d093e6f841cc82f072fd1b19573628392ca640a.tar.gz
Merge remote-tracking branch 'origin/daisy' into daisy-eneav4.0-rc1enea-linux-4.0-rc1
Diffstat (limited to 'meta-crownbay')
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 60ebd44..661cec8 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -6,5 +6,5 @@ KBRANCH_crownbay-noemgd = "standard/crownbay"
6KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" 6KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
7 7
8LINUX_VERSION_crownbay-noemgd = "3.14.0" 8LINUX_VERSION_crownbay-noemgd = "3.14.0"
9SRCREV_machine_crownbay-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 9SRCREV_machine_crownbay-noemgd = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
10SRCREV_meta_crownbay-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" 10SRCREV_meta_crownbay-noemgd = "ad5f23c47b299418a88f13b1e6f119602115804a"