tree b8fe3c67046ecd7b26f6fe4c70e9652cce100298
parent a5fb40d9f9fa41e6ca492d3ef5b396ffc08be4ff
parent 48417677833df75009ca878477957a347bf6d7e0
author Simon Butcher <simon.butcher@arm.com> 1528791924 +0100
committer Simon Butcher <simon.butcher@arm.com> 1528791924 +0100

Merge remote-tracking branch 'public/pr/1465' into mbedtls-2.1

The previous merge of PR #1465 was based on an out of date version of the PR
and missed two commits, so this merges the PR again.