diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-13 15:09:18 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-13 15:09:18 +0000 |
commit | 50f602fe6b12943a3847fb1925b1e5cb554bed97 (patch) | |
tree | 2a2ff973dafefa91abcf3295fbca155de6414127 /strata/bsp-armv7b-vexpress-tc2.morph | |
parent | 655a27dd00b54302978076523f784fe98e5a684f (diff) | |
parent | fe37ca6dfc32f13e89975f916abb0d95b9b4f09b (diff) | |
download | infrastructure-50f602fe6b12943a3847fb1925b1e5cb554bed97.tar.gz |
Merge remote-tracking branch 'baserock/master'
Conflicts:
scripts/licensecheck.sh
strata/lorry-controller.morph
strata/trove.morph
Diffstat (limited to 'strata/bsp-armv7b-vexpress-tc2.morph')
-rw-r--r-- | strata/bsp-armv7b-vexpress-tc2.morph | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph index f8a7ff00..616d564f 100644 --- a/strata/bsp-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] |