Merge pull request #172 from soby-mathew/sm/asm_assert

author danh-arm <dan.handley@arm.com>

Mon, 28 Jul 2014 13:28:40 +0000 (14:28 +0100)

committer danh-arm <dan.handley@arm.com>

Mon, 28 Jul 2014 13:28:40 +0000 (14:28 +0100)
author danh-arm <dan.handley@arm.com>
Mon, 28 Jul 2014 13:28:40 +0000 (14:28 +0100)
committer danh-arm <dan.handley@arm.com>
Mon, 28 Jul 2014 13:28:40 +0000 (14:28 +0100)
diff --cc bl31/aarch64/bl31_entrypoint.S
Simple merge
diff --cc bl31/aarch64/runtime_exceptions.S
Simple merge
diff --cc docs/porting-guide.md
Simple merge
diff --cc include/plat/common/platform.h
Simple merge
author	danh-arm <dan.handley@arm.com>
	Mon, 28 Jul 2014 13:28:40 +0000 (14:28 +0100)
committer	danh-arm <dan.handley@arm.com>
	Mon, 28 Jul 2014 13:28:40 +0000 (14:28 +0100)
		1	2
bl31/aarch64/bl31_entrypoint.S	patch \|	diff1 \|	diff2 \|	blob \| history
bl31/aarch64/runtime_exceptions.S	patch \|	diff1 \|	diff2 \|	blob \| history
docs/porting-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
include/plat/common/platform.h	patch \|	diff1 \|	diff2 \|	blob \| history