GitLab

Conflicts:
	plat/fvp/bl32_plat_setup.c
	plat/fvp/platform.mk
	services/spd/tspd/tspd_main.c

Change-Id: I43fbfb7e085c89f8c051ce15687365ba8324d02e