tree 7efb1ace758af73f1c515a76456203cc92ae61de
parent adb4fa5921beaea03191e6d4f28508b8d7692f5d
parent 420f3589e3a52ec0754bb350f3abf5cef75ac7ce
author Jaeden Amero <jaeden.amero@arm.com> 1567524808 +0100
committer Jaeden Amero <jaeden.amero@arm.com> 1567524808 +0100

Merge remote-tracking branch 'origin/pr/2770' into mbedtls-2.16

* origin/pr/2770:
  Fix the license header of hkdf