tree 4692c2dc74f6c6bab55cc1464ecd0b66bca00530
parent 8b0deef299dabad96a2afec984ecfcd97055bcd5
author Dave Rodgman <dave.rodgman@arm.com> 1686157197 +0100
committer Dave Rodgman <dave.rodgman@arm.com> 1686158085 +0100

Correct minor merge mistakes

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>