diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-05-13 09:51:51 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-05-13 09:51:51 +0000 |
commit | a1d5011d51f83f6c13916e34a24565435217b885 (patch) | |
tree | 29ddff21d533eaa02b0f10f668981435601801de /strata/bsp-x86_32-generic.morph | |
parent | 5a10111c049228302e37d495c1a32588a7cc41f6 (diff) | |
parent | 0e0a329c086d424452eaa0bfa77e573f77e3b930 (diff) | |
download | infrastructure-a1d5011d51f83f6c13916e34a24565435217b885.tar.gz |
Merge remote-tracking branch 'definitions/master'pedro/openssl101t
Change-Id: I3c7b31d2006dafd8b69386cbee41d0d568b348eb
Diffstat (limited to 'strata/bsp-x86_32-generic.morph')
-rw-r--r-- | strata/bsp-x86_32-generic.morph | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 05d179b5..9c83c359 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -10,8 +10,8 @@ chunks: - name: linux-x86-32-generic morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph repo: upstream:linux - ref: 39a8804455fb23f09157341d3ba7db6d7ae6ee76 - unpetrify-ref: v4.0 + ref: b562e44f507e863c6792946e4e1b1449fbbac85d + unpetrify-ref: v4.5 - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph repo: upstream:nasm |