Merge pull request #843 from jeenu-arm/cas-lock

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

Mon, 20 Feb 2017 13:59:50 +0000 (13:59 +0000)

committer GitHub <noreply@github.com>

Mon, 20 Feb 2017 13:59:50 +0000 (13:59 +0000)
author danh-arm <dan.handley@arm.com>
Mon, 20 Feb 2017 13:59:50 +0000 (13:59 +0000)
committer GitHub <noreply@github.com>
Mon, 20 Feb 2017 13:59:50 +0000 (13:59 +0000)
diff --cc Makefile
Simple merge
diff --cc docs/firmware-design.md
Simple merge
diff --cc docs/user-guide.md
Simple merge
author	danh-arm <dan.handley@arm.com>
	Mon, 20 Feb 2017 13:59:50 +0000 (13:59 +0000)
committer	GitHub <noreply@github.com>
	Mon, 20 Feb 2017 13:59:50 +0000 (13:59 +0000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
docs/firmware-design.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history