Andrew Thoelke
authored
Conflicts: plat/fvp/bl2_plat_setup.c plat/fvp/platform.h Change-Id: I5bcc5180a2b4f944d07969b2e17e0f92cca72c89
Conflicts: plat/fvp/bl2_plat_setup.c plat/fvp/platform.h Change-Id: I5bcc5180a2b4f944d07969b2e17e0f92cca72c89