Conflicts: bl2/bl2_main.c Change-Id: I2f2ee2db6ee70536deaefc562a04037bf16c22a4
Attach a file by drag & drop or click to upload