Merge pull request #102 from achingupta:ag/tf-issues#104-v2

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/platform.h
Simple merge
diff --cc plat/fvp/platform.mk
Simple merge
diff --cc services/std_svc/psci/psci_entry.S
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/platform.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/fvp/platform.mk	patch \|	diff1 \|	diff2 \|	blob \| history
services/std_svc/psci/psci_entry.S	patch \|	diff1 \|	diff2 \|	blob \| history