Merge pull request #93 from danh-arm:dh/tf-issues#68
Conflicts:
	bl2/bl2_main.c

Change-Id: I2f2ee2db6ee70536deaefc562a04037bf16c22a4
commit 034b699c98a41e63979f44e9ebe17549e54f069e
2 parents c4cc3af + cdb738c
@Andrew Thoelke Andrew Thoelke authored on 21 May 2014
Showing 3 changed files
View
bl2/bl2_main.c
View
docs/porting-guide.md
View
drivers/io/io_fip.c