Merge pull request #860 from jeenu-arm/hw-asstd-coh

author davidcunado-arm <david.cunado@arm.com>

Fri, 17 Mar 2017 12:34:37 +0000 (12:34 +0000)

committer GitHub <noreply@github.com>

Fri, 17 Mar 2017 12:34:37 +0000 (12:34 +0000)
author davidcunado-arm <david.cunado@arm.com>
Fri, 17 Mar 2017 12:34:37 +0000 (12:34 +0000)
committer GitHub <noreply@github.com>
Fri, 17 Mar 2017 12:34:37 +0000 (12:34 +0000)
diff --cc Makefile
Simple merge
diff --cc bl31/aarch64/bl31_entrypoint.S
Simple merge
diff --cc bl32/sp_min/aarch32/entrypoint.S
Simple merge
diff --cc docs/user-guide.md
Simple merge
author	davidcunado-arm <david.cunado@arm.com>
	Fri, 17 Mar 2017 12:34:37 +0000 (12:34 +0000)
committer	GitHub <noreply@github.com>
	Fri, 17 Mar 2017 12:34:37 +0000 (12:34 +0000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
bl31/aarch64/bl31_entrypoint.S	patch \|	diff1 \|	diff2 \|	blob \| history
bl32/sp_min/aarch32/entrypoint.S	patch \|	diff1 \|	diff2 \|	blob \| history
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history