Merge pull request #561 from antonio-nino-diaz-arm/an/bootwrapper

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

Tue, 29 Mar 2016 14:39:01 +0000 (15:39 +0100)

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

Tue, 29 Mar 2016 14:39:01 +0000 (15:39 +0100)
author danh-arm <dan.handley@arm.com>
Tue, 29 Mar 2016 14:39:01 +0000 (15:39 +0100)
committer danh-arm <dan.handley@arm.com>
Tue, 29 Mar 2016 14:39:01 +0000 (15:39 +0100)
diff --cc Makefile
Simple merge
diff --cc docs/porting-guide.md
Simple merge
diff --cc docs/user-guide.md
Simple merge
author	danh-arm <dan.handley@arm.com>
	Tue, 29 Mar 2016 14:39:01 +0000 (15:39 +0100)
committer	danh-arm <dan.handley@arm.com>
	Tue, 29 Mar 2016 14:39:01 +0000 (15:39 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
docs/porting-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history