Merge "delay: timeout detection support" into integration
authorSoby Mathew <soby.mathew@arm.com>
Fri, 4 Oct 2019 13:47:40 +0000 (13:47 +0000)
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>
Fri, 4 Oct 2019 13:47:40 +0000 (13:47 +0000)

Trivial merge