tree 75e3b21186977655e3b314324ae7117c22cc48fe
parent a79001e5b281317e13e2c35c73a768da720c2220
parent 980d203a6bcbe9e7cbc7f0022935f5dba21646f0
author Gilles Peskine <Gilles.Peskine@arm.com> 1516665446 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1516665446 +0100

Merge branch 'pr_1163' into development-proposed