tree 0c601011cd2796294b3ef65d8ff746fc3b002aa1
parent 04965edaa883b7c77ebc7917761195d6895a2e12
author Simon Butcher <simon.butcher@arm.com> 1488456354 +0000
committer Simon Butcher <simon.butcher@arm.com> 1488456354 +0000

Fix mistake in ChangeLog from file merge