Merge "delay: correct timeout_init_us()" into integration
authorSoby Mathew <soby.mathew@arm.com>
Tue, 8 Oct 2019 12:58:48 +0000 (12:58 +0000)
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>
Tue, 8 Oct 2019 12:58:48 +0000 (12:58 +0000)

Trivial merge