| commit | 7b9575c654c61e9515963d92e045a7fdc2a668cb | [log] [tgz] |
|---|---|---|
| author | Jaeden Amero <jaeden.amero@arm.com> | Mon Jan 28 12:28:49 2019 +0000 |
| committer | Jaeden Amero <jaeden.amero@arm.com> | Mon Jan 28 12:28:49 2019 +0000 |
| tree | ff92f2df4fa67618f2a8f758eefc3f27465ec371 | |
| parent | d253bb49e70060aab771b2fae10113070e85242d [diff] | |
| parent | 2192c27720aba777c81dec0ec2ab865ee60686d5 [diff] |
Merge remote-tracking branch 'origin/pr/2376' into development-psa
Resolve conflict in updating crypto submodule by manually pointing the
submodule to 2169a5e54ded ("PSA: Adapt pk.c, pk_wrap.c, cipher.c to new
key policy init API").