Merge pull request #233 from jcastillo-arm/jc/tf-issues/254

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

Fri, 16 Jan 2015 17:55:45 +0000 (17:55 +0000)

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

Fri, 16 Jan 2015 17:55:45 +0000 (17:55 +0000)
author danh-arm <dan.handley@arm.com>
Fri, 16 Jan 2015 17:55:45 +0000 (17:55 +0000)
committer danh-arm <dan.handley@arm.com>
Fri, 16 Jan 2015 17:55:45 +0000 (17:55 +0000)
diff --cc docs/firmware-design.md
Simple merge
diff --cc plat/juno/juno_def.h
Simple merge
author	danh-arm <dan.handley@arm.com>
	Fri, 16 Jan 2015 17:55:45 +0000 (17:55 +0000)
committer	danh-arm <dan.handley@arm.com>
	Fri, 16 Jan 2015 17:55:45 +0000 (17:55 +0000)
		1	2
docs/firmware-design.md	patch \|	diff1 \|	diff2 \|	blob \| history
plat/juno/juno_def.h	patch \|	diff1 \|	diff2 \|	blob \| history