tree 6ea0ec261f0cd08fff986dd20ad776e4848f469c
parent 5450d1f597fa3c1a763b4257c19e8086fc994d91
parent 1afdec18127f20e821efe9af545bf4f7dd92d142
author Jaeden Amero <jaeden.amero@arm.com> 1524586538 +0100
committer Jaeden Amero <jaeden.amero@arm.com> 1524586594 +0100

Merge branch 'development-proposed' into development-restricted-proposed

Resolve merge conflict in ecp.h, where `mbedtls_ecp_keypair` was moved.