Merge pull request #1515 from bryanodonoghue/atf-master+linaro-warp7-squash-v4
authorDimitris Papastamos <dimitris.papastamos@arm.com>
Wed, 5 Sep 2018 11:20:10 +0000 (12:20 +0100)
committerGitHub <noreply@github.com>
Wed, 5 Sep 2018 11:20:10 +0000 (12:20 +0100)
Atf master+linaro warp7 squash v4


Trivial merge