Merge "Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__" into integration
authorAlexei Fedorov <Alexei.Fedorov@arm.com>
Fri, 2 Aug 2019 08:57:02 +0000 (08:57 +0000)
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>
Fri, 2 Aug 2019 08:57:02 +0000 (08:57 +0000)

Trivial merge