Merge pull request #533 from yatharth-arm/yk/genfw-1292

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

Fri, 26 Feb 2016 09:47:05 +0000 (09:47 +0000)

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

Fri, 26 Feb 2016 09:47:05 +0000 (09:47 +0000)
author danh-arm <dan.handley@arm.com>
Fri, 26 Feb 2016 09:47:05 +0000 (09:47 +0000)
committer danh-arm <dan.handley@arm.com>
Fri, 26 Feb 2016 09:47:05 +0000 (09:47 +0000)
diff --cc include/plat/arm/board/common/board_arm_def.h
Simple merge
diff --cc include/plat/arm/common/arm_def.h
Simple merge
author	danh-arm <dan.handley@arm.com>
	Fri, 26 Feb 2016 09:47:05 +0000 (09:47 +0000)
committer	danh-arm <dan.handley@arm.com>
	Fri, 26 Feb 2016 09:47:05 +0000 (09:47 +0000)
		1	2
include/plat/arm/board/common/board_arm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/plat/arm/common/arm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history