Merge "Fix type of cot_desc_ptr" into integration
authorJohn Tsichritzis <john.tsichritzis@arm.com>
Mon, 17 Jun 2019 11:51:24 +0000 (11:51 +0000)
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>
Mon, 17 Jun 2019 11:51:24 +0000 (11:51 +0000)

Trivial merge