Merge pull request #164 from sandrine-bailleux/sb/bl30-support-v2

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

Fri, 11 Jul 2014 13:16:13 +0000 (14:16 +0100)

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

Fri, 11 Jul 2014 13:16:13 +0000 (14:16 +0100)
author danh-arm <dan.handley@arm.com>
Fri, 11 Jul 2014 13:16:13 +0000 (14:16 +0100)
committer danh-arm <dan.handley@arm.com>
Fri, 11 Jul 2014 13:16:13 +0000 (14:16 +0100)
diff --cc docs/porting-guide.md
Simple merge
diff --cc docs/user-guide.md
Simple merge
author	danh-arm <dan.handley@arm.com>
	Fri, 11 Jul 2014 13:16:13 +0000 (14:16 +0100)
committer	danh-arm <dan.handley@arm.com>
	Fri, 11 Jul 2014 13:16:13 +0000 (14:16 +0100)
		1	2
docs/porting-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history