Merge pull request #572 from jcastillo-arm/jc/tbb_nvcounter

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

Thu, 7 Apr 2016 16:10:44 +0000 (17:10 +0100)

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

Thu, 7 Apr 2016 16:10:44 +0000 (17:10 +0100)
author danh-arm <dan.handley@arm.com>
Thu, 7 Apr 2016 16:10:44 +0000 (17:10 +0100)
committer danh-arm <dan.handley@arm.com>
Thu, 7 Apr 2016 16:10:44 +0000 (17:10 +0100)
diff --cc docs/porting-guide.md
Simple merge
diff --cc include/plat/common/platform.h
Simple merge
author	danh-arm <dan.handley@arm.com>
	Thu, 7 Apr 2016 16:10:44 +0000 (17:10 +0100)
committer	danh-arm <dan.handley@arm.com>
	Thu, 7 Apr 2016 16:10:44 +0000 (17:10 +0100)
		1	2
docs/porting-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
include/plat/common/platform.h	patch \|	diff1 \|	diff2 \|	blob \| history