Merge pull request #217 from jcastillo-arm/jc/tf-issues/257

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

Tue, 28 Oct 2014 12:25:51 +0000 (12:25 +0000)

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

Tue, 28 Oct 2014 12:25:51 +0000 (12:25 +0000)
author danh-arm <dan.handley@arm.com>
Tue, 28 Oct 2014 12:25:51 +0000 (12:25 +0000)
committer danh-arm <dan.handley@arm.com>
Tue, 28 Oct 2014 12:25:51 +0000 (12:25 +0000)
diff --cc docs/firmware-design.md
Simple merge
diff --cc docs/user-guide.md
Simple merge
author	danh-arm <dan.handley@arm.com>
	Tue, 28 Oct 2014 12:25:51 +0000 (12:25 +0000)
committer	danh-arm <dan.handley@arm.com>
	Tue, 28 Oct 2014 12:25:51 +0000 (12:25 +0000)
		1	2
docs/firmware-design.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history