Andrew Thoelke 421c572a7e Merge commit 'for-v0.4/05.20^' into for-v0.4 ... Conflicts: plat/fvp/bl32_plat_setup.c plat/fvp/platform.mk services/spd/tspd/tspd_main.c Change-Id: Ib4bad39a8a476a6b1796298f95dfb97c8b100975		2014-05-21 11:30:59 +01:00
..
tsp	Merge commit 'for-v0.4/05.20^' into for-v0.4	2014-05-21 11:30:59 +01:00