Merge pull request #661 from dp-arm/master

author danh-arm <[email protected]>

Tue, 9 Aug 2016 09:16:36 +0000 (10:16 +0100)

committer GitHub <[email protected]>

Tue, 9 Aug 2016 09:16:36 +0000 (10:16 +0100)
author danh-arm <[email protected]>
Tue, 9 Aug 2016 09:16:36 +0000 (10:16 +0100)
committer GitHub <[email protected]>
Tue, 9 Aug 2016 09:16:36 +0000 (10:16 +0100)
diff --cc Makefile
Simple merge
diff --cc docs/firmware-design.md
Simple merge
diff --cc docs/user-guide.md
Simple merge
author	danh-arm <[email protected]>
	Tue, 9 Aug 2016 09:16:36 +0000 (10:16 +0100)
committer	GitHub <[email protected]>
	Tue, 9 Aug 2016 09:16:36 +0000 (10:16 +0100)
		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