Conflicts: bl32/tsp/tsp_main.c Change-Id: Ieae4532658dc782685bc6926c774a7c65201d954
Attach a file by drag & drop or click to upload
