tree 87a0eec40403d3ab4ab999c0a704ff9878f7aaed
parent 61937d4a83db6b5d976ca45e3517336809db2539
author Simon Butcher <simon.butcher@arm.com> 1501277543 +0100
committer Simon Butcher <simon.butcher@arm.com> 1501277543 +0100

Fix ChangeLog for duplication after merge