tree 8e5bd4b76c2555d190508db3d3b632eaacbb46c8
parent 8950112a8b68d9257d02b7f92e5a07dcc11f459c
parent c623316404e00954461a69b0f6017a2e58319846
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> 1635964680 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> 1635964680 +0100

Merge changes from topic "fix_checkpatch_merges" into integration

* changes:
  fix(plat/st): remove double space
  fix(checkpatch): do not check merge commits