Merge pull request #100 from jcastillo-arm:jc/tf-issues/149-v4

author Andrew Thoelke <andrew.thoelke@arm.com>

Fri, 23 May 2014 10:00:04 +0000 (11:00 +0100)

committer Andrew Thoelke <andrew.thoelke@arm.com>

Fri, 23 May 2014 10:00:04 +0000 (11:00 +0100)
author Andrew Thoelke <andrew.thoelke@arm.com>
Fri, 23 May 2014 10:00:04 +0000 (11:00 +0100)
committer Andrew Thoelke <andrew.thoelke@arm.com>
Fri, 23 May 2014 10:00:04 +0000 (11:00 +0100)
diff --cc docs/user-guide.md
Simple merge
diff --cc plat/fvp/bl2_plat_setup.c
Simple merge
diff --cc plat/fvp/platform.h
Simple merge
author	Andrew Thoelke <andrew.thoelke@arm.com>
	Fri, 23 May 2014 10:00:04 +0000 (11:00 +0100)
committer	Andrew Thoelke <andrew.thoelke@arm.com>
	Fri, 23 May 2014 10:00:04 +0000 (11:00 +0100)
		1	2
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
plat/fvp/bl2_plat_setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
plat/fvp/platform.h	patch \|	diff1 \|	diff2 \|	blob \| history