tree 9048ce5b512b891ca7a224a09af2099773f3b36c
parent 2e65a54d5a2414b8fd3dc36ee1cca3ab9a36586c
author Simon Butcher <simon.butcher@arm.com> 1501086355 +0100
committer Simon Butcher <simon.butcher@arm.com> 1501164481 +0100

Fix merge errors in ChangeLog