summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2015-06-13 05:11:49 +0200
committerGeorge Nita <george.nita@enea.com>2015-06-13 05:11:49 +0200
commit32cb2f377edf745ec0ec79d1845e6069bde8d0c8 (patch)
tree06927ed77902cfab9b9a94b646b7e21541eebd61
parentd9780cbbd6d63cba9be28088f1da56df5eaa11ca (diff)
parent2fafedaa4ae900f82eed572860114b8baa9b36e6 (diff)
downloadmeta-intel-32cb2f377edf745ec0ec79d1845e6069bde8d0c8.tar.gz
Merge remote-tracking branch 'origin/master' into master-enea
-rw-r--r--common/recipes-kernel/linux/linux-yocto_3.19.bbappend8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_3.19.bbappend b/common/recipes-kernel/linux/linux-yocto_3.19.bbappend
index acdf5efa..36cec322 100644
--- a/common/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_3.19.bbappend
@@ -5,16 +5,16 @@ KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"
5 5
6LINUX_VERSION_core2-32-intel-common = "3.19.5" 6LINUX_VERSION_core2-32-intel-common = "3.19.5"
7COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" 7COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
8SRCREV_meta_core2-32-intel-common = "7215fe431391a322c7e39f410e7b8f2a2b507892" 8SRCREV_meta_core2-32-intel-common = "118f27167f4626fc7c71cefbec7c55a41d3a6d62"
9SRCREV_machine_core2-32-intel-common = "0befa35f40997c90936047e57fbbdd7edbf7e525" 9SRCREV_machine_core2-32-intel-common = "e152349de59b43b2a75f2c332b44171df461d5a0"
10KMACHINE_core2-32-intel-common = "intel-core2-32" 10KMACHINE_core2-32-intel-common = "intel-core2-32"
11KBRANCH_core2-32-intel-common = "standard/base" 11KBRANCH_core2-32-intel-common = "standard/base"
12KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 12KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
13 13
14LINUX_VERSION_corei7-64-intel-common = "3.19.5" 14LINUX_VERSION_corei7-64-intel-common = "3.19.5"
15COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" 15COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
16SRCREV_meta_corei7-64-intel-common = "7215fe431391a322c7e39f410e7b8f2a2b507892" 16SRCREV_meta_corei7-64-intel-common = "118f27167f4626fc7c71cefbec7c55a41d3a6d62"
17SRCREV_machine_corei7-64-intel-common = "0befa35f40997c90936047e57fbbdd7edbf7e525" 17SRCREV_machine_corei7-64-intel-common = "e152349de59b43b2a75f2c332b44171df461d5a0"
18KMACHINE_corei7-64-intel-common = "intel-corei7-64" 18KMACHINE_corei7-64-intel-common = "intel-corei7-64"
19KBRANCH_corei7-64-intel-common = "standard/base" 19KBRANCH_corei7-64-intel-common = "standard/base"
20KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 20KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"