tree bbd450be9c0b146f2fdbd66fde54ebaea3825036
parent 4b117d9c92c2bdef5551bc21dbb998928812dab9
parent 86e5230e548ae792bd2d8bd14483c2ac7479da9e
author Gilles Peskine <Gilles.Peskine@arm.com> 1511886652 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1511886752 +0100

Merge remote-tracking branch 'upstream-public/pr/1089' into development

Resolve trivial conflict due to additions in the same place in
tests/data_files/Makefile; minor comment/whitespace presentation
improvements.