diff options
| author | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
|---|---|---|
| committer | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
| commit | 6ef83e1cb65080174a888faef3a0791158f10ee4 (patch) | |
| tree | 6b028d3ab33c369284f41614d1c14aef8994c2cc /meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | |
| parent | accc04b57bb68da4542bcecd49d95dcb03efd909 (diff) | |
| parent | 185ac2bc78f4c23c2023b5ecad3a21e3f3fc34de (diff) | |
| download | meta-intel-6ef83e1cb65080174a888faef3a0791158f10ee4.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Conflicts:
common/recipes-kernel/linux/linux-yocto_3.10.bbappend
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.bbappend | 10 |
1 files changed, 5 insertions, 5 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 37cf96e5..1b7ff84c 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" | |||
| 11 | KBRANCH_crownbay-noemgd = "standard/crownbay" | 11 | KBRANCH_crownbay-noemgd = "standard/crownbay" |
| 12 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" | 12 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" |
| 13 | 13 | ||
| 14 | LINUX_VERSION = "3.10.32" | 14 | LINUX_VERSION = "3.10.34" |
| 15 | 15 | ||
| 16 | SRCREV_meta_crownbay = "6e0e756d51372c8b176c5d1e6f786545bceed351" | 16 | SRCREV_meta_crownbay = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
| 17 | SRCREV_machine_crownbay = "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718" | 17 | SRCREV_machine_crownbay = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
| 18 | SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | 18 | SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
| 19 | 19 | ||
| 20 | SRCREV_meta_crownbay-noemgd = "6e0e756d51372c8b176c5d1e6f786545bceed351" | 20 | SRCREV_meta_crownbay-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
| 21 | SRCREV_machine_crownbay-noemgd = "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718" | 21 | SRCREV_machine_crownbay-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
| 22 | 22 | ||
| 23 | SRC_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" | 23 | SRC_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" |