summaryrefslogtreecommitdiff
path: root/strata/bsp-x86_64-generic.morph
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-10 12:10:10 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-10 12:10:10 +0000
commit20d3b06ba1dcd1ad11d6f71804edb90a1d2be13f (patch)
treee8a517ff63d2a27efe30535c52232b2be285f3c3 /strata/bsp-x86_64-generic.morph
parent9a736742213feb10f1a2eee73cd2108ebcce9056 (diff)
parentab44cd0a38acf030bcbacea60c9bfcc2f1b5cdc3 (diff)
downloaddefinitions-20d3b06ba1dcd1ad11d6f71804edb90a1d2be13f.tar.gz
Merge remote-tracking branch 'origin/baserock/ps/linux-v3.18-v2'
Reviewed-By: Emmet Hikory <emmet.hikory@codethink.co.uk> Reviewed-By: Javier Jardón <javier.jardon@codethink.co.uk> Reviewed-By: James Thomas <james.thomas@codethink.co.uk> Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'strata/bsp-x86_64-generic.morph')
-rw-r--r--strata/bsp-x86_64-generic.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index 8a7b9c9b..a24a34c5 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -8,8 +8,8 @@ chunks:
- name: linux-x86-64-generic
morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph
repo: upstream:linux
- ref: d67a0e110187abd560a1de63fa172894a52839d5
- unpetrify-ref: baserock/morph
+ ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d
+ unpetrify-ref: v3.18
build-depends: []
- name: nasm
morph: strata/bsp-x86_64-generic/nasm.morph