Merge pull request #177 from jcastillo-arm/jc/tf-issues/096

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

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

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

Mon, 28 Jul 2014 13:33:44 +0000 (14:33 +0100)
author danh-arm <dan.handley@arm.com>
Mon, 28 Jul 2014 13:33:44 +0000 (14:33 +0100)
committer danh-arm <dan.handley@arm.com>
Mon, 28 Jul 2014 13:33:44 +0000 (14:33 +0100)
diff --cc plat/fvp/aarch64/fvp_common.c
Simple merge
diff --cc plat/fvp/bl31_fvp_setup.c
Simple merge
author	danh-arm <dan.handley@arm.com>
	Mon, 28 Jul 2014 13:33:44 +0000 (14:33 +0100)
committer	danh-arm <dan.handley@arm.com>
	Mon, 28 Jul 2014 13:33:44 +0000 (14:33 +0100)
		1	2
plat/fvp/aarch64/fvp_common.c	patch \|	diff1 \|	diff2 \|	blob \| history
plat/fvp/bl31_fvp_setup.c	patch \|	diff1 \|	diff2 \|	blob \| history