mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2026-07-07 23:22:04 +00:00
Conflicts: plat/fvp/bl32_plat_setup.c plat/fvp/platform.mk services/spd/tspd/tspd_main.c Change-Id: Ib4bad39a8a476a6b1796298f95dfb97c8b100975